Merge branch 'fix-wth-1122' into 'master'

理赔件管理、EOB管理、回款管理详情页表格分页问题处理

See merge request !14

src/views/charge-query/lpjManageDetail.vue

@@ -106,7 +106,7 @@
       </template>
     </a-table>
     <!--分页-->
-    <BurtPagination :pagination="pagination" @pageChange="getData" />
+    <BurtPagination :pagination="pagination" @pageChange="getPageData" />
 
     <a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
       okText="确定" cancelText="取消"
@@ -243,6 +243,20 @@ export default {
       }
       this.selectedRowKeys = arr;
     },
+    // 分页回调
+    getPageData(pager) {
+      if(pager){
+        this.pagination = {
+            ...this.pagination,
+            ...pager
+        }
+      }
+      if(this.isEditNewBill) { // 新增时添加了账单信息 那分页也应该是调账单信息接口
+        this._getNewBillList()
+      } else {
+        this.getData()
+      }
+    },
     // 获取列表数据
     getData() {
       this.selectedRowKeys = [];
@@ -378,6 +392,10 @@ export default {
         })
       }else{ //查询所有未加入的账单
         this.pagination.pageNum = 1;
+        this._getNewBillList()
+      }
+    },
+    _getNewBillList() {
         this.$apis.QUERYNOSENDRECEIPLIST({
           pageNum: this.pagination.pageNum,
           pageSize: this.pagination.pageSize,
@@ -393,7 +411,6 @@ export default {
             this.$message.error(res.returnMsg);
           }
         });
-      }
     },
     //新建/保存寄送
     addNewCharge(){

src/views/verification/collectionDetail.vue

@@ -66,7 +66,7 @@
         <!-- <a-button v-if="record.backMoneyNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button> -->
       </template>
     </a-table>
-    <BurtPagination :pagination="pagination" @pageChange="getData" />
+    <BurtPagination :pagination="pagination" @pageChange="pageChange" />
 
     <a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
       okText="确定" cancelText="取消"
@@ -194,8 +194,14 @@ export default {
       this.selectedRowKeys = arr;
     },
     pageChange(pager) {
-      const { current } = pager;
-      this.pagination.pageNum = current;
+      this.pagination = {
+        ...this.pagination,
+        ...pager
+      }
+      if(this.isEditNewEOB) { // 点击添加EOB之后 分页数据查询就应该调EOB数据
+        this._getNewEOBList()
+        return true;
+      }
       this.getData();
     },
     // 获取保险公司下拉选项
@@ -234,6 +240,10 @@ export default {
         })
       }else{ //查询所有未加入的账单
         this.pagination.pageNum = 1;
+        this._getNewEOBList()
+      }
+    },
+    _getNewEOBList(){
         this.$apis.QUERYEOBINFOLIST({
           pageNum: this.pagination.pageNum,
           pageSize: this.pagination.pageSize
@@ -248,9 +258,8 @@ export default {
             this.$message.error(res.returnMsg);
           }
         });
-      }
     },
-    //新建/保存回款
+     //新建/保存回款
     addNewEvt(){
       let backMoneyEobList = [];
       this.dataList.forEach((item,index)=>{

src/views/verification/indexDetail.vue

@@ -93,7 +93,7 @@
         <!-- <a-button v-if="record.eobNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button> -->
       </template>
     </a-table>
-    <BurtPagination :pagination="pagination" @pageChange="getData" />
+    <BurtPagination :pagination="pagination" @pageChange="pageChange" />
 
     <a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
       okText="确定" cancelText="取消"
@@ -253,6 +253,18 @@ export default {
         this.companyOptions = res.content || [];
       });
     },
+    // 分页
+    pageChange(pager) {
+      this.pagination = {
+        ...this.pagination,
+        ...pager
+      }
+      if(this.isEditNewEob) { // 点击添加EOB之后 分页数据查询就应该调EOB数据
+        this._getNewEOBList()
+        return true;
+      }
+      this.getData();
+    },
     getData() {
        this.$apis.QUERYEOBRECEIPTLIST({
         pageNum: this.pagination.pageNum,
@@ -358,6 +370,10 @@ export default {
         })
       }else{ //查询所有未加入的账单
         this.pagination.pageNum = 1;
+        this._getNewEOBList();
+      }
+    },
+    _getNewEOBList() {
         this.$apis.QUERYEOBNEEDRECEIPTLIST({
           pageNum: this.pagination.pageNum,
           pageSize: this.pagination.pageSize
@@ -372,7 +388,6 @@ export default {
             this.$message.error(res.returnMsg);
           }
         });
-      }
     },
     //新建/保存EOB
     addNewEvt(){