Merge branch 'func_eccs_2250' into test

src/views/charge-query/index.vue

@@ -128,6 +128,9 @@
 			<template slot="status" slot-scope="text">
 				<span :style="{ color: text == 2 ? 'red' : '' }">{{ text == 1 ? '有效' : text == 2 ? '无效' : '' }}</span>
 			</template>
+			<template slot="redText" slot-scope="text">
+				<span style="color: red">{{ text }}</span>
+			</template>
 		</a-table>
 		<!--分页-->
 		<BurtPagination :pagination="pagination" @pageChange="_getChargeList" />
@@ -171,8 +174,8 @@ export default {
 			{ title: '理赔金额', dataIndex: 'actualAmount', width: 180 },
 			{ title: '保险已支付', dataIndex: 'backAmount', width: 180 },
 			{ title: '保险欠费', dataIndex: 'insuranceArrearsAmount', width: 180 },
-			{ title: '个人欠费', dataIndex: 'arrearsAmount', width: 180 },
-			{ title: '备注', dataIndex: 'remark', width: 200 },
+			{ title: '个人欠费', dataIndex: 'arrearsAmount', width: 180, scopedSlots: { customRender: 'redText' } },
+			{ title: '备注', dataIndex: 'remark', width: 200, scopedSlots: { customRender: 'redText' } },
 			{ title: '未清余额', dataIndex: 'residueBackAmount', width: 180 },
 			{ title: '账龄', dataIndex: 'diffDay', width: 180 },
 			{

src/views/verification/collectionDetail.vue

@@ -5,6 +5,7 @@
 			<a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title">
 				<a-form-model ref="ruleForm" :model="form" :rules="rules">
 					<a-row :gutter="30">
+						<template v-if="activeKey === '0'">
 							<a-col :lg="7" :sm="12">
 								<a-form-model-item label="保险公司" prop="payorCode">
 									<a-select
@@ -13,7 +14,7 @@
 										allow-clear
 										show-search
 										:disabled="!isEdit"
-									style="min-width: 200px"
+										style="min-width: 200px; max-width: 250px"
 										@change="changePayor"
 										:filterOption="filterCode"
 									>
@@ -23,7 +24,6 @@
 									</a-select>
 								</a-form-model-item>
 							</a-col>
-						<template v-if="activeKey === '0'">
 							<a-col :lg="5" :sm="12">
 								<a-form-model-item label="回款日期" prop="backDate">
 									<a-date-picker
@@ -36,10 +36,10 @@
 									/>
 								</a-form-model-item>
 							</a-col>
-						</template>
 							<a-col :lg="6" :sm="12">
 								<a-form-model-item label="回款金额(人民币)" prop="backAmountCny">
 									<a-input
+										class="fixed_width"
 										type="number"
 										v-model="form.backAmountCny"
 										placeholder="请输入金额"
@@ -50,13 +50,13 @@
 							</a-col>
 							<a-col :lg="5" :sm="12">
 								<a-form-model-item label="可核销余额">
-								<a-input v-model="residueBackAmount" disabled />
+									<a-input class="fixed_width" v-model="residueBackAmount" disabled />
 								</a-form-model-item>
 							</a-col>
-						<template v-if="activeKey === '0'">
 							<a-col :lg="7" :sm="12">
 								<a-form-model-item label="回款金额(美元)">
 									<a-input
+										class="fixed_width"
 										type="number"
 										v-model="form.backAmountUsd"
 										placeholder="请输入金额"
@@ -97,6 +97,43 @@
 								</a-form-model-item>
 							</a-col>
 						</template>
+						<template v-else>
+							<a-col :lg="9" :sm="12">
+								<a-form-model-item label="保险公司" prop="payorCode">
+									<a-select
+										v-model="form.payorCode"
+										placeholder="请选择保险公司"
+										allow-clear
+										show-search
+										:disabled="!isEdit"
+										style="min-width: 200px"
+										@change="changePayor"
+										:filterOption="filterCode"
+									>
+										<a-select-option v-for="item in companyOptions" :key="item.payorCode" :value="item.payorCode">
+											{{ item.longName }}
+										</a-select-option>
+									</a-select>
+								</a-form-model-item>
+							</a-col>
+							<a-col :lg="8" :sm="12">
+								<a-form-model-item label="回款金额(人民币)" prop="backAmountCny">
+									<a-input
+										class="fixed_width"
+										type="number"
+										v-model="form.backAmountCny"
+										placeholder="请输入金额"
+										allow-clear
+										:disabled="!isEdit"
+									/>
+								</a-form-model-item>
+							</a-col>
+							<a-col :lg="7" :sm="12">
+								<a-form-model-item label="可核销余额">
+									<a-input class="fixed_width" v-model="residueBackAmount" disabled />
+								</a-form-model-item>
+							</a-col>
+						</template>
 					</a-row>
 				</a-form-model>
 				<template v-if="activeKey === '1'">
@@ -212,7 +249,7 @@
 												class="table-content all-list"
 												:columns="columns"
 												:data-source="dataList"
-												:scroll="{ x: '100%', y: tableHeight }"
+												:scroll="{ x: '100%', y: tableHeight1 }"
 												:pagination="false"
 												:rowKey="'id'"
 												:row-selection="{
@@ -314,7 +351,8 @@ export default {
 					code: 1
 				}
 			],
-			tableHeight: 200 // 表格高度
+			tableHeight: 200, // 已关联账单表格高度
+			tableHeight1: 200 // 全部账单表格高度
 		};
 	},
 	mixins: [mixins],
@@ -519,15 +557,6 @@ export default {
 			return Number(totalMoney.toFixed(2));
 		}
 	},
-	watch: {
-		selectedRows: {
-			handler(val) {
-				console.log(val);
-			},
-			deep: true,
-			immediate: true
-		}
-	},
 	created() {
 		this.simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
 		const { backMoneyNo, isEdit } = this.$route.query;
@@ -569,9 +598,10 @@ export default {
 			const paddingT = parseFloat(style.getPropertyValue('padding-top'));
 			const paddingB = parseFloat(style.getPropertyValue('padding-bottom'));
 			const paddingSum = paddingT + paddingB;
-			this.tableHeight = containterH - 350 - gobackH - paddingSum;
+			this.tableHeight = containterH - 300 - gobackH - paddingSum;
+			this.tableHeight1 = containterH - 340 - gobackH - paddingSum;
 			// 设置每页展示条数
-			const pageSize = Math.floor((this.tableHeight - 10) / 32);
+			const pageSize = Math.floor((this.tableHeight1 - 10) / 32);
 			this.$set(this.pagination, 'pageSize', pageSize);
 		},
 		// 已关联账单表格行类名
@@ -623,16 +653,17 @@ export default {
 			this.addNewEvt(0);
 		},
 		onSelectAll(selected, selectedRows, changeRows) {
-			let chgRows = changeRows.map((item) => {
-				return {
+			if (selected) {
+				this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map((item) => item.id));
+				changeRows.forEach((item) => {
+					const obj = {
 						...item,
 						backAmount:
 							this.residueBackAmount > item.currentReceiptAmount ? item.currentReceiptAmount : this.residueBackAmount
 					};
+					this.selectedRows.push(obj);
 				});
-			if (selected) {
-				this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map((item) => item.id));
-				this.selectedRows = this.selectedRows.concat(chgRows);
+				// this.selectedRows = this.selectedRows.concat(chgRows);
 			} else {
 				changeRows.forEach((item) => {
 					const findIndex = this.selectedRowKeys.findIndex((rowId) => rowId === item.id);
@@ -710,7 +741,9 @@ export default {
 		// 获取已关联的账单
 		getData() {
 			if (!this.backMoneyNo) {
+				if (this.activeKey1 === '0') {
 					this.$message.error('暂未关联账单，请在全部账单中添加账单');
+				}
 				return;
 			}
 			let billDate = this.searchForm.billDate || [];
@@ -816,10 +849,11 @@ export default {
 			});
 
 			this.$apis.SAVEBACKMONEY(formData).then((res) => {
+				const msg = backStatus === 1 ? '结案' : '暂存';
 				if (res.returnCode == '0000') {
 					this.backMoneyNo = res.content;
 					this.savedStatus = true;
-					this.$message.success('成功');
+					this.$message.success(`${msg}成功`);
 					this.selectedRowKeys = [];
 					this.getData();
 					this._getNewEOBList();
@@ -895,7 +929,7 @@ export default {
 	}
 }
 .all-list_box {
-	height: calc(100vh - 430px);
+	height: calc(100vh - 400px);
 	overflow-y: auto;
 	&.no-data {
 		display: flex;
@@ -951,6 +985,9 @@ export default {
 			min-height: 0;
 		}
 	}
+	.fixed_width {
+		max-width: 150px;
+	}
 }
 .bill-content {
 	overflow-y: auto;
@@ -981,4 +1018,20 @@ export default {
 		color: red;
 	}
 }
+
+@media screen and (min-width: 1920px) {
+	.all-list_box {
+		height: calc(100vh - 420px);
+	}
+}
+@media screen and (min-width: 1920px) {
+	.all-list_box {
+		height: calc(100vh - 420px);
+	}
+}
+@media screen and (min-width: 1440px) {
+	.all-list_box {
+		height: calc(100vh - 400px);
+	}
+}
 </style>