Merge branch 'func_eccs_2803' into test

src/views/verification/collectionDetail.vue

@@ -305,7 +305,10 @@
                         </a-col>
                         <a-col class="flex-col" :lg="4" :sm="12">
                           <div>
-                            <a-button type="primary" @click="searchData">
+                            <a-button
+                              type="primary"
+                              @click="searchData('init')"
+                            >
                               <Icon name="ssisearch_active" :size="14" />查询
                             </a-button>
                           </div>
@@ -619,7 +622,7 @@ export default {
       const base = JSON.parse(JSON.stringify(this.columns))
       const changeAmount = this.changeAmount
       const delRecord = this.delRecord
-      base[7] = {
+      base[8] = {
         title: '回款金额',
         dataIndex: 'backAmount',
         ellipsis: true,
@@ -640,7 +643,7 @@ export default {
           )
         }
       }
-      base[10].customRender = (val, row) => {
+      base[11].customRender = (val, row) => {
         return (
           <div>
             {this.isEdit ? (
@@ -673,7 +676,7 @@ export default {
           </div>
         )
       }
-      base[8] = {
+      base[9] = {
         title: '未清余额',
         dataIndex: 'residueBackAmount',
         ellipsis: true,
@@ -686,7 +689,7 @@ export default {
           return Number(residueBackAmount.toFixed(2))
         }
       }
-      base[9] = {
+      base[10] = {
         title: '个人欠费',
         dataIndex: 'arrearsAmount',
         ellipsis: true,
@@ -705,7 +708,7 @@ export default {
           )
         }
       }
-      base.splice(7, 0, {
+      base.splice(8, 0, {
         title: '余末金额',
         dataIndex: 'currentReceiptAmount',
         ellipsis: true,
@@ -758,7 +761,7 @@ export default {
         patientName: '', // 客户名字
         hasBack: 'N'
       }
-      this.searchData()
+      this.searchData('init')
     }
   },
   created() {
@@ -836,7 +839,10 @@ export default {
       return record.hidden ? 'hide_' : ''
     },
     // 账单查询
-    searchData() {
+    searchData(type) {
+      if (type === 'init') {
+        this.pagination.pageNum = 1
+      }
       if (this.activeKey1 === '1') {
         this._getNewEOBList()
       } else {