提交达沃特

src/api/financialManagement/paymentRequest.js

@@ -91,8 +91,8 @@ export const paymentCheck = (data) => {
 //账单明细列表
 export function getBillList(current,size,params) {
   return request({
-    // url: '/api/trade-finance/acc/list',
-    url: '/api/trade-finance/acc/billList',
+    url: '/api/trade-finance/acc/list',
+    // url: '/api/trade-finance/acc/billList',
     method: 'get',
     params: {
       ...params,

src/views/reimbursement/config/mainList.json

@@ -30,6 +30,13 @@
       "search": true
     },
     {
+      "label": "所属公司",
+      "prop": "belongToCorpName",
+      "overHidden": true,
+      "minWidth": 120,
+      "search": true
+    },
+    {
       "label": "报销人",
       "prop": "userName",
       "overHidden": true,
@@ -65,6 +72,19 @@
       "search": false
     },
     {
+      "label": "状态",
+      "width": 100,
+      "type": "select",
+      "overHidden": true,
+      "search": true,
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=claim_status",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dataType": "string",
+      "prop": "status"
+    },{
       "label": "备注",
       "prop": "remarks",
       "overHidden": true,

src/views/reimbursement/index.vue

@@ -9,6 +9,7 @@
         :page.sync="page"
         :search.sync="search"
         :table-loading="loading"
+        :key="key"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
         @search-change="searchChange"
@@ -67,6 +68,9 @@
             ></el-option>
           </el-select>
         </template>
+        <template slot="belongToCorpNameSearch">
+          <crop-select v-model="search.belongToCorpId" :refresh="false" corpType="GS" style="width: 100%" ref="KHSelect"></crop-select>
+        </template>
         <template slot-scope="scope" slot="userName">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.userName }}</span>
         </template>
@@ -106,6 +110,7 @@ export default {
         total: 0,
         pageSizes: [10, 50, 100, 200, 300, 400, 500]
       },
+      key:0,
       search: {},
       show: true,
       loading: false,
@@ -119,6 +124,7 @@ export default {
     gainUser().then(res => {
       this.userOption = res.data.data;
     })
+    this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++