Merge branch 'master' into login-change

src/layout/index.vue

 <template>
   <div>
-    <router-view></router-view>
+    <keep-alive>
+      <router-view v-if="$route.meta && $route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!($route.meta && $route.meta.keepAlive)"></router-view>
   </div>
 </template>
 

src/router/modules/charge-query.js

@@ -8,7 +8,10 @@ export default {
     {
       path:'',
       name: "chargeQueryIndex",
-      component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/index.vue")
+      component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/index.vue"),
+      meta:{
+        keepAlive:true
+      }
     },
     {
       path: "detail",
@@ -18,7 +21,10 @@ export default {
     {
       path: "lpjManage",
       name: "chargeQueryLpjManage",
-      component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/lpjManage.vue")
+      component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/lpjManage.vue"),
+      meta:{
+        keepAlive:true
+      }
     },
     {
       path: "lpjManageDetail",

src/router/modules/verification.js

@@ -19,6 +19,9 @@ export default {
       path: "collection",
       name: "VerificationCollection",
       component: () => import("@/views/verification/collection"),
+      meta:{
+        keepAlive:true
+      }
     },
     {
       path: "collectionDetail",

src/views/charge-query/index.vue

@@ -246,7 +246,8 @@ export default {
 					code: 1
 				}
 			],
-			ciReceiptTotalVo: {}
+			ciReceiptTotalVo: {},
+			iscreated:false
 		};
 	},
 	components: {
@@ -258,9 +259,17 @@ export default {
 		})
 	},
 	created() {
+		this.iscreated = true
 		this._getCompanyOptions();
 		this._getDoctorListNoPage(); //获取医生下拉选项
 	},
+	activated(){
+    if(!this.iscreated){
+      this._getCompanyOptions();
+    }else{
+      this.iscreated = false
+    }
+  },
 	methods: {
 		moment,
 		// 获取未清余额合计

src/views/charge-query/lpjManage.vue

@@ -136,16 +136,27 @@ export default {
         pageSize: 10,
         total: 0,
       },
+      iscreated:false
     };
   },
   components: {
     BurtPagination,
   },
   created() {
+    this.iscreated = true
     this.getData();
     this._getCompanyOptions();
     this.getRefcdByRefgrp();
   },
+  activated(){
+    if(!this.iscreated){
+      this.getData();
+      this._getCompanyOptions();
+      this.getRefcdByRefgrp();
+    }else{
+      this.iscreated = false
+    }
+  },
   methods: {
     moment,
     // 获取列表数据
@@ -190,6 +201,7 @@ export default {
     handlerReset() {
       this.form = {
         dateRange: [],
+		billDate:[],
         payorCode: '',
         sendBatchNo: '',
         sendCompany: '',

src/views/charge-query/lpjManageDetail.vue

@@ -119,6 +119,7 @@
                 <span class="blue-text">￥{{ totalAmount }}</span>
                 <span :style="{color: 'red'}" v-if="invalidActualAmount > 0">（无效{{ invalidActualAmount }}元）</span>
               </div>  
+              <a-button v-if="isEditNewBill" size="small" type="primary" @click="checkAll">全选</a-button>
             </div>
             <a-form-model-item label="button">
               <a-button type="primary" @click="handlerSearch">
@@ -235,7 +236,7 @@ export default {
       isEditNewBill: false, //是否在新建账单
       pagination: {
         pageNum: 1,
-        pageSize: 100,
+        pageSize: 200,
         total: 0,
       },
       editFormObj: {
@@ -335,6 +336,28 @@ export default {
       }
       this.selectedRowKeys = arr;
     },
+    // 全选
+    checkAll() {
+      this.$apis.QUERYNOSENDRECEIPLIST({
+          pageNum: 1,
+          pageSize:  this.pagination.total,
+          payorCode: this.form.payorCode,
+          ...this.searchData
+        })
+        .then((res) => {
+          if (res.returnCode == "0000") {
+            const dataList = res.content.list || [];
+            const selectedRowKeys = dataList.map((item, index) => index);
+            this.onSelectChange(selectedRowKeys)
+            const index = Math.ceil(dataList.length / this.pagination.pageSize)
+            for(let i = 1; i < index + 1 ; i++) {
+              this.cacheDataList[i] = dataList.slice((i-1)*this.pagination.pageSize, i*this.pagination.pageSize)
+            }
+          } else {
+            this.$message.error(res.returnMsg);
+          }
+        });
+    },
     // 分页回调
     getPageData(pager) {
       if(pager){
@@ -375,18 +398,22 @@ export default {
     getTotal(){
       let totalNum = 0
       let totalMoney= 0
+      let invalidNum = 0
+      let invalidActualAmount = 0
       if(this.dataList.length>0){
         this.dataList.forEach((item)=>{
           totalNum++
           totalMoney = Big(totalMoney).plus(item.actualAmount)
           if(item.status == 2){
-            this.invalidNum++
-            this.invalidActualAmount = Big(this.invalidActualAmount).plus(item.actualAmount)
+            invalidNum++
+            invalidActualAmount = Big(invalidActualAmount).plus(item.actualAmount)
           }
         })
       }
       this.totalActualAmount = totalMoney
       this.totalListNum = totalNum
+      this.invalidNum = invalidNum
+      this.invalidActualAmount = invalidActualAmount
     },
     // 获取保险公司下拉选项
     _getCompanyOptions() {
@@ -547,7 +574,7 @@ export default {
         })
         .then((res) => {
           if (res.returnCode == "0000") {
-            this.selectedRowKeys = [];
+            // this.selectedRowKeys = [];
             let content = res.content || {};
             this.pagination.total = content.total || 0;
             this.dataList = content.list || [];
@@ -618,13 +645,13 @@ export default {
           if (res.returnCode == "0000") {
             this.sendBatchNo = res.content;
             this.$message.success("成功");
-            this.selectedRowKeys = [];
+            // this.selectedRowKeys = [];
             this.cacheDataList = {}
             if(this.isEditNewBill) { // 新增时添加了账单信息 那分页也应该是调账单信息接口
-        this._getNewBillList()
-        } else {
-          this.getData()
-        }
+              this._getNewBillList()
+            } else {
+              this.getData()
+            }
             resolve();
           } else {
             this.$message.error(res.returnMsg);

src/views/verification/collection.vue

@@ -179,16 +179,26 @@ export default {
         { name: '全部', value: '' },
         { name: '已结案', value: '1' },
         { name: '暂存', value: '0' }
-      ]
+      ],
+      iscreated: false
     };
   },
   components: {
     BurtPagination,
   },
   created() {
+    this.iscreated = true
     this.getData();
     this._getCompanyOptions();
   },
+  activated(){
+    if(!this.iscreated){
+      this.getData();
+      this._getCompanyOptions();
+    }else{
+      this.iscreated = false
+    }
+  },
   methods: {
     moment,
     pageChange(pager) {

src/views/verification/collectionDetail.vue

@@ -145,7 +145,11 @@
 				</a-form-model>
 				<template v-if="activeKey === '1'">
 					<div class="bill-content">
-						<div class="checked-count">已勾选账单：<span class="blue-text">{{ selectedRowKeys.length || 0 }}</span> 条<span v-if="selectedRows.filter(v=> v.status == 2).length != 0">，其中：无效 <span style="color: red;">{{ selectedRows.filter(v=> v.status == 2).length || 0 }}</span> 条</span></div>
+						<div class="checked-count">
+							<a-button type="primary" size="small" @click="selectAllList">全选</a-button>
+							已勾选账单：<span class="blue-text">{{ selectedRowKeys.length || 0 }}</span> 条
+							<span v-if="selectedRows.filter(v=> v.status == 2).length != 0">，其中：无效 <span style="color: red;">{{ selectedRows.filter(v=> v.status == 2).length || 0 }}</span> 条</span>
+						</div>
 						<a-tabs type="card" v-model="activeKey1">
 							<a-tab-pane v-for="pane in panes1" :key="pane.key" :tab="pane.title">
 								<div>
@@ -725,6 +729,37 @@ export default {
 			}
 			this.addNewEvt(0);
 		},
+		// 全选
+		selectAllList() {
+			let billDate = this.searchForm.billDate || [];
+			this.$apis
+				.QUERYBACKRECEIPTINFOLIST({
+					pageNum: 1,
+					pageSize: this.pagination.total,
+					backMoneyNo: this.backMoneyNo,
+					payorCode: this.form.payorCode,
+					...this.searchForm,
+					receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
+					receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined
+				})
+				.then((res) => {
+					if (res.returnCode == '0000') {
+						let content = res.content || {};
+						const dataList =
+							content.list.map((item) => {
+								item.arrearsAmountShow = item.arrearsAmount;
+								item.arrearsAmount = '';
+								return item;
+							}) || [];
+						// 
+						this.selectedRowKeys = dataList.map(item => item.id)
+						this.selectedRows = dataList
+						this.addNewEvt(0);
+					} else {
+						this.$message.error(res.returnMsg);
+					}
+				});
+		},
 		delRecord(record, index) {
 			this.selectedRowKeys.splice(index, 1);
 			this.selectedRows.splice(index, 1);
@@ -1110,5 +1145,9 @@ export default {
 	position: absolute;
 	top: 14px;
 	left: 210px;
+	z-index: 10;
+	button {
+		margin-right: 6px;
+	}
 }
 </style>