Merge branch 'dev1.0.2' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into dev1.0.2

src/views/creditManage/coreEnterprise/indexTable.js

@@ -135,6 +135,10 @@ export default {
             return <span>{ row.process ? '是' : '否' }</span>
           }
         },
+        {
+          label: '执行人',
+          prop: 'assigneeName'
+        },
         {
           label: '最近提交时间',
           prop: 'gmtModified'

src/views/creditManage/projectCredit/indexTable.js

@@ -117,12 +117,8 @@ export default {
           showTooltip: true
         },
         {
-          label: '是否流程授信',
-          prop: 'process',
-          showTooltip: true,
-          render: (h, row) => {
-            return <span>{ row.process ? '是' : '否' }</span>
-          }
+          label: '执行人',
+          prop: 'assigneeName'
         },
         {
           label: '最近提交时间',

src/views/settlementManagement/index.vue

@@ -22,9 +22,9 @@
                   >
                     <el-option
                       v-for="item in statusList"
-                      :key="item.id"
+                      :key="item.code"
                       :label="item.name"
-                      :value="item.id"
+                      :value="item.code"
                     >
                     </el-option>
                   </el-select>
@@ -99,17 +99,17 @@ export default {
         params: {
           page: this.page || 1,
           rows: this.size || 10,
-          statusId: this.search.statusId,
+          status: this.search.status,
           businessNo: this.search.businessNo,
-          customerName: this.search.customerName,
+          fastSearch: this.search.fastSearch,
           simpleClassName: 'BillBasicInformation'
         },
         data: {
           page: this.page || 1,
           rows: this.size || 10,
-          statusId: this.search.statusId,
+          status: this.search.status,
           businessNo: this.search.businessNo,
-          customerName: this.search.customerName,
+          fastSearch: this.search.fastSearch,
           simpleClassName: 'BillBasicInformation'
         }
       }).then(({ records, rows }) => {