Merge branch 'func_eccs_2376' into 'master'

Func eccs 2376 增加统计账单数及理赔金额

See merge request !66

src/api/apis_moudles/base.js

@@ -6,6 +6,9 @@ export default {
   planCodeList: "/backstage/auth/planList", // 根据corporCode查询
   uploadImg: "/common/upload",
   specialtyList: "/backstage/auth/specialtyList",
+  receiptCount: "/backstage/auth/receiptCount",
+  backMoneyReportCount: "/backstage/auth/backMoneyReportCount",
+  queryBackReceiptCount: "/backstage/auth/queryBackReceiptCount",
   coverageCode: "/backstage/auth/coverageMasterList",
   getRefcdByRefgrp: "/common/getRefcdByRefgrp", // 公共获取码表接口
   checkUserEmail: "/backstage/user/checkUserEmail", // 校验用户邮箱

src/api/funcs_modules/base.js

@@ -51,6 +51,17 @@ const CHECKUSEREMAIL = (data) => {
   return req.post(`${apis.checkUserEmail}?userName=${data.userName}`);
 };
 
+
+// 
+const receiptCount = (data) => {
+  return req.post(`${apis.receiptCount}`, data);
+};
+const backMoneyReportCount = (data) => {
+  return req.post(`${apis.backMoneyReportCount}`, data);
+};
+const queryBackReceiptCount = (data) => {
+  return req.post(`${apis.queryBackReceiptCount}`, data);
+};
 // 对象数组
 export default {
   GETUSERINFO,
@@ -59,6 +70,9 @@ export default {
   GETPLANCODEBYCORP,
   GETSPECIALTYLIST,
   UPLOADIMG,
+  receiptCount,
+  queryBackReceiptCount,
+  backMoneyReportCount,
   GETCOVERAGECODE,
   GETREFCDBYREFGRP,
   CHECKUSEREMAIL,

src/assets/style/common.less

@@ -1049,3 +1049,11 @@ button::-moz-focus-inner {
 .p-r() {
     position: relative;
 }
+
+.blue-text{
+    color: #2B63FF;
+}
+
+.red-text{
+    color: red;
+}

src/views/charge-query/lpjManageDetail.vue

@@ -110,13 +110,13 @@
           <div class="btn-div flex">
             <div class="total-div flex">
              <div>
-                <span>总帐单数：</span>
-                <span>{{ totalListNum + selectedRowKeys.length }}</span>个
-                <span :style="{color: 'red'}" v-if="invalidNum > 0">（无效{{ invalidNum }}个）</span>
+                <span>总账单数：</span>
+                <span class="blue-text">{{ totalListNum + selectedRowKeys.length }}</span> 条
+                <span :style="{color: 'red'}" v-if="invalidNum > 0">（无效{{ invalidNum }} 条）</span>
               </div>
               <div>
                 <span>理赔金额合计：</span>
-                <span>{{ totalAmount }}</span>元
+                <span class="blue-text">￥{{ totalAmount }}</span>
                 <span :style="{color: 'red'}" v-if="invalidActualAmount > 0">（无效{{ invalidActualAmount }}元）</span>
               </div>  
             </div>

src/views/customer/info/index.vue

@@ -252,7 +252,4 @@ export default {
 .ant-btn .icon-class {
   .mg-r(10);
 }
-.red-text{
-  color: red;
-}
 </style>

src/views/report/returnedMoney.vue

@@ -6,7 +6,8 @@
 			<a-row :gutter="30">
 				<a-col :xl="4" :lg="6" :sm="12">
 					<a-form-model-item label="保险公司">
-						<a-select v-model="form.payorCode" placeholder="请选择" show-search allowClear :filterOption="filterCode">
+						<a-select v-model="form.payorCode" placeholder="请选择" show-search allowClear
+							:filterOption="filterCode">
 							<a-select-option v-for="item in companyOptions" :key="item.payorCode" :value="item.payorCode">
 								{{ item.longName }}
 							</a-select-option>
@@ -25,27 +26,17 @@
 				</a-col>
 				<a-col :xl="6" :lg="6" :sm="12">
 					<a-form-model-item label="账单起止日期">
-						<a-range-picker
-							format="YYYY-MM-DD"
-							format-value="YYYY-MM-DD"
-							v-model="billRange"
-							:placeholder="['开始时间', '结束时间']"
-							@change="onSelectBillTime"
-						/>
+						<a-range-picker format="YYYY-MM-DD" format-value="YYYY-MM-DD" v-model="billRange"
+							:placeholder="['开始时间', '结束时间']" @change="onSelectBillTime" />
 					</a-form-model-item>
 				</a-col>
 				<a-col :xl="6" :lg="6" :sm="12">
 					<a-form-model-item label="回款起止日期">
-						<a-range-picker
-							format="YYYY-MM-DD"
-							format-value="YYYY-MM-DD"
-							v-model="returnRange"
-							:placeholder="['开始时间', '结束时间']"
-							@change="onSelectReturnTime"
-						/>
+						<a-range-picker format="YYYY-MM-DD" format-value="YYYY-MM-DD" v-model="returnRange"
+							:placeholder="['开始时间', '结束时间']" @change="onSelectReturnTime" />
 					</a-form-model-item>
 				</a-col>
-				<a-col :xl="10" :lg="10" :sm="12" class="none-label">
+				<a-col :xl="6" :lg="10" :sm="12" class="none-label">
 					<a-form-model-item label="button">
 						<a-button class="mar-left10" type="primary" @click="handlerReset">
 							<Icon name="ssireset" :size="14" />重置
@@ -58,21 +49,42 @@
 						</a-button>
 					</a-form-model-item>
 				</a-col>
+				<a-col :xl="3" :lg="6" :sm="12" class="none-label" style="position: relative; top: 10px;">
+					<a-form-model-item label="账单回款金额合计">
+						<div>
+							共计 <span class="blue-text">{{ ciReceiptTotalVo.totalNum || 0 }}</span> 条
+							<!-- <span v-if="ciReceiptTotalVo.invalidNum">，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</span>	 -->
+						</div>
+
+					</a-form-model-item>
+					
+				</a-col>
+				<a-col :xl="3" :lg="10" :sm="12" class="none-label" style="position: relative; top: 10px;">
+					<a-form-model-item label="回款金额合计">
+						<div>账单金额合计：<span class="blue-text">￥{{ ciReceiptTotalVo.actualAmountTotal || 0 }}</span></div>
+					</a-form-model-item>
+					
+				</a-col>
+				<a-col :xl="3" :lg="10" :sm="12" class="none-label" style="position: relative; top: 10px;">
+					<a-form-model-item label="回款金额合计">
+						<div>回款金额合计：<span class="blue-text">￥{{ ciReceiptTotalVo.paidAmountEobTotal || 0 }}</span></div>
+					</a-form-model-item>
+					
+				</a-col>
+				<a-col :xl="3" :lg="10" :sm="12" class="none-label" style="position: relative; top: 10px;">
+					<a-form-model-item label="个人欠费合计">
+						<div>个人欠费合计：<span class="red-text">￥{{ ciReceiptTotalVo.arrearsAmountTotal || 0 }}</span></div>
+					</a-form-model-item>
+					
+				</a-col>
 			</a-row>
 		</a-form-model>
 
 		<!-- table -->
-		<a-table
-			:columns="columns"
-			:data-source="dataList"
-			:scroll="{ x: true }"
-			:pagination="false"
-			:rowKey="
-				(record) => {
-					record.id + record.backMoneyNo;
-				}
-			"
-		>
+		<a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false" :rowKey="(record) => {
+				record.id + record.backMoneyNo;
+			}
+			">
 			<template slot="index" slot-scope="text, record, index">
 				{{ index + 1 }}
 			</template>
@@ -105,7 +117,10 @@ export default {
 			{ title: '账单编号', dataIndex: 'receiptNo', width: 120 },
 			{ title: '账单日期', dataIndex: 'receiptDate', width: 120 },
 			{ title: '收银', dataIndex: 'receiptTellerName', width: 120 },
-			{ title: '账单金额', dataIndex: 'actualAmount', width: 120 },
+			{ 
+				title: '账单金额', dataIndex: 'actualAmount', width: 120, 
+				// customRender: val => <span class="blue-text">{val}</span> 
+			},
 			{ title: '回款金额', dataIndex: 'paidAmountEob', width: 120 },
 			{
 				title: '个人欠费',
@@ -133,6 +148,7 @@ export default {
 			columns,
 			billRange: null,
 			returnRange: null,
+			ciReceiptTotalVo:{},
 			form: {
 				payorCode: '',
 				mrnNo: '',
@@ -165,6 +181,18 @@ export default {
 		filterCode(input, option) {
 			return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 		},
+		// 获取未清余额合计
+		getBackMoneyReportCount() {
+			this.$apis.backMoneyReportCount({
+				...this.pageForm,
+				...this.pagination
+			}).then((res) => {
+				if (res.returnCode == '0000') {
+					console.log(res.content)
+					this.ciReceiptTotalVo = res.content
+				}
+			});
+		},
 		// 获取列表数据
 		getList() {
 			const data = {
@@ -174,7 +202,7 @@ export default {
 			this.$apis.backMoneyReport(data).then((res) => {
 				let content = res.content || {};
 				this.dataList = content.list || [];
-
+				this.getBackMoneyReportCount()
 				this.pagination.total = content.total || 0;
 			});
 		},
@@ -228,10 +256,12 @@ export default {
 <style lang="less" scoped>
 .none-label {
 	text-align: left;
+
 	.ant-form-item-label {
 		opacity: 0;
 	}
 }
+
 .ant-btn .icon-class {
 	.mg-r(10);
 }

src/views/verification/collectionDetail.vue

@@ -98,7 +98,7 @@
 							</a-col>
 						</template>
 						<template v-else>
-							<a-col :lg="9" :sm="12">
+							<a-col :lg="6" :sm="12">
 								<a-form-model-item label="保险公司" prop="payorCode">
 									<a-select
 										v-model="form.payorCode"
@@ -116,7 +116,7 @@
 									</a-select>
 								</a-form-model-item>
 							</a-col>
-							<a-col :lg="8" :sm="12">
+							<a-col :lg="6" :sm="12">
 								<a-form-model-item label="回款金额(人民币)" prop="backAmountCny">
 									<a-input
 										class="fixed_width"
@@ -128,7 +128,13 @@
 									/>
 								</a-form-model-item>
 							</a-col>
-							<a-col :lg="7" :sm="12">
+							<a-col :lg="6" :sm="12">
+								<a-form-model-item label="本次账单回款金额合计">
+									<div class="blue-text">{{ ciReceiptTotalVo.backAmountTotal || 0 }}</div>
+								</a-form-model-item>
+								
+							</a-col>
+							<a-col :lg="6" :sm="12">
 								<a-form-model-item label="可核销余额">
 									<a-input class="fixed_width" v-model="residueBackAmount" disabled />
 								</a-form-model-item>
@@ -138,6 +144,7 @@
 				</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>
 						<a-tabs type="card" v-model="activeKey1">
 							<a-tab-pane v-for="pane in panes1" :key="pane.key" :tab="pane.title">
 								<div>
@@ -319,6 +326,7 @@ export default {
 			isEdit: false,
 			EOBStatusOptions,
 			dialogShow: false,
+			ciReceiptTotalVo:{},
 			form: {
 				payorCode: undefined,
 				backDate: null,
@@ -615,6 +623,18 @@ export default {
 	},
 	methods: {
 		moment,
+		// 获取未清余额合计
+		getBackMoneyReportCount(params) {
+			this.$apis.queryBackReceiptCount({
+				...params,
+				...this.pagination
+			}).then((res) => {
+				if (res.returnCode == '0000') {
+					console.log(res.content)
+					this.ciReceiptTotalVo = res.content
+				}
+			});
+		},
 		// 计算表格最大高度
 		calcTableHeight() {
 			const dom = this.$refs.burt;
@@ -787,6 +807,14 @@ export default {
 				})
 				.then((res) => {
 					if (res.returnCode == '0000') {
+						this.getBackMoneyReportCount({
+							pageNum: 1,
+							pageSize: 999,
+							backMoneyNo: this.backMoneyNo,
+							...this.searchForm,
+							receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
+							receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined
+						})
 						const list = res.content.list || [];
 						let ids = [];
 						this.selectedRows = list.map((item) => {
@@ -816,6 +844,15 @@ export default {
 				})
 				.then((res) => {
 					if (res.returnCode == '0000') {
+						this.getBackMoneyReportCount({
+							pageNum: this.pagination.pageNum,
+							pageSize: this.pagination.pageSize,
+							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
+						})
 						let content = res.content || {};
 						this.pagination.total = content.total || 0;
 						this.dataList =
@@ -1022,6 +1059,7 @@ export default {
 	overflow-y: auto;
 	overflow-x: hidden;
 	padding-right: 12px;
+	position: relative;
 	::v-deep {
 		.ant-form-item {
 			margin-right: 0;
@@ -1066,4 +1104,9 @@ export default {
 		height: calc(100vh - 400px);
 	}
 }
+.checked-count{
+	position: absolute;
+	top: 14px;
+	left: 210px;
+}
 </style>