Merge branch 'func_eccs_2250' into test

src/components/Antd/index.js

@@ -22,7 +22,8 @@ import {
   Spin,
   Collapse,
   Tabs,
-  Tooltip
+  Tooltip,
+	Popover
 } from "ant-design-vue";
 
 export default () => {
@@ -49,7 +50,8 @@ export default () => {
     Spin,
     Collapse,
     Tabs,
-    Tooltip
+    Tooltip,
+		Popover
   ];
   // 注册
   els.forEach((item) => {

src/views/report/returnedMoney.vue

@@ -29,7 +29,7 @@
 							format="YYYY-MM-DD"
 							format-value="YYYY-MM-DD"
 							v-model="billRange"
-              :placeholder="['开始时间','结束时间']"  
+							:placeholder="['开始时间', '结束时间']"
 							@change="onSelectBillTime"
 						/>
 					</a-form-model-item>
@@ -40,7 +40,7 @@
 							format="YYYY-MM-DD"
 							format-value="YYYY-MM-DD"
 							v-model="returnRange"
-              :placeholder="['开始时间','结束时间']"  
+							:placeholder="['开始时间', '结束时间']"
 							@change="onSelectReturnTime"
 						/>
 					</a-form-model-item>
@@ -67,7 +67,11 @@
 			:data-source="dataList"
 			:scroll="{ x: true }"
 			:pagination="false"
-      :rowKey="record => {record.id+record.backMoneyNo}"
+			:rowKey="
+				(record) => {
+					record.id + record.backMoneyNo;
+				}
+			"
 		>
 			<template slot="index" slot-scope="text, record, index">
 				{{ index + 1 }}
@@ -79,28 +83,37 @@
 </template>
 
 <script>
-import BurtPagination from "@/components/CUSTOMER/pagation";
+import BurtPagination from '@/components/CUSTOMER/pagation';
 import { exportFile } from '@/utils/index';
 
 export default {
 	data() {
 		const columns = [
-      { title: "序号", dataIndex: "index", key:"index",align:'center', width: 80,scopedSlots: { customRender: "index" }},
-      { title: "病历号", dataIndex: "mrnNo",width: 120},
-      { title: "客户姓名",dataIndex: "patientName",width: 120,},
-      { title: "保险公司", dataIndex: "payorName", width: 120 },
-      { title: "客户生日", dataIndex: "birthday", width: 120 },
-      { title: "保险卡号", dataIndex: "cardNo", width: 120 },
-      { title: "账单编号", dataIndex: "receiptNo", width: 120 },
-      { title: "账单日期", dataIndex: "receiptDate", width: 120 },
-      { title: "收银", dataIndex: "receiptTellerName", width: 120 },
-      { title: "账单金额", dataIndex: "actualAmount", width: 120 },
-      { title: "回款金额", dataIndex: "paidAmountEob", width: 120 },
-      { title: "回款日期", dataIndex: "eobBackDate", width: 120 },
-      { title: "回款编号", dataIndex: "backMoneyNo", width: 120 },
-      { title: "EOB号", dataIndex: "eobNo", width: 120 },
-      { title: "EOB备注", dataIndex: "eobName", width: 120 },
-      { title: "账龄", dataIndex: "diffDay", width: 120 },
+			{
+				title: '序号',
+				dataIndex: 'index',
+				key: 'index',
+				align: 'center',
+				width: 80,
+				scopedSlots: { customRender: 'index' }
+			},
+			{ title: '病历号', dataIndex: 'mrnNo', width: 120 },
+			{ title: '客户姓名', dataIndex: 'patientName', width: 120 },
+			{ title: '保险公司', dataIndex: 'payorName', width: 120 },
+			{ title: '客户生日', dataIndex: 'birthday', width: 120 },
+			{ title: '保险卡号', dataIndex: 'cardNo', width: 120 },
+			{ title: '账单编号', dataIndex: 'receiptNo', width: 120 },
+			{ title: '账单日期', dataIndex: 'receiptDate', width: 120 },
+			{ title: '收银', dataIndex: 'receiptTellerName', width: 120 },
+			{ title: '账单金额', dataIndex: 'actualAmount', width: 120 },
+			{ title: '回款金额', dataIndex: 'paidAmountEob', width: 120 },
+			{ title: '个人欠费', dataIndex: 'arrearsAmountShow', width: 120 },
+			{ title: '备注', dataIndex: 'remark', width: 180 },
+			{ title: '回款日期', dataIndex: 'eobBackDate', width: 120 },
+			{ title: '回款编号', dataIndex: 'backMoneyNo', width: 120 },
+			{ title: 'EOB号', dataIndex: 'eobNo', width: 120 },
+			{ title: 'EOB备注', dataIndex: 'eobName', width: 120 },
+			{ title: '账龄', dataIndex: 'diffDay', width: 120 }
 		];
 		return {
 			columns,
@@ -123,11 +136,11 @@ export default {
 				pageNum: 1,
 				pageSize: 10,
 				total: 0
-      },
+			}
 		};
 	},
 	components: {
-    BurtPagination,
+		BurtPagination
 	},
 	created() {
 		this.getList();
@@ -136,17 +149,13 @@ export default {
 	methods: {
 		// 选择框筛选
 		filterCode(input, option) {
-	    return (
-	      option.componentOptions.children[0].text
-	        .toLowerCase()
-	        .indexOf(input.toLowerCase()) >= 0
-	    );
+			return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 		},
 		// 获取列表数据
 		getList() {
 			const data = {
 				...this.pageForm,
-        ...this.pagination,
+				...this.pagination
 			};
 			this.$apis.backMoneyReport(data).then((res) => {
 				let content = res.content || {};
@@ -163,17 +172,17 @@ export default {
 		},
 
 		onSelectBillTime(date, dateString) {
-        this.form.receiptDateStart = dateString[0] ? dateString[0] + ' 00:00:00' : ''
-        this.form.receiptDateEnd = dateString[1] ? dateString[1] + ' 23:59:59' : ''
+			this.form.receiptDateStart = dateString[0] ? dateString[0] + ' 00:00:00' : '';
+			this.form.receiptDateEnd = dateString[1] ? dateString[1] + ' 23:59:59' : '';
 		},
 		onSelectReturnTime(date, dateString) {
-        this.form.eobBackDateStart = dateString[0] ? dateString[0] + ' 00:00:00' : ''
-        this.form.eobBackDateEnd = dateString[1] ? dateString[1] + ' 23:59:59' : ''
+			this.form.eobBackDateStart = dateString[0] ? dateString[0] + ' 00:00:00' : '';
+			this.form.eobBackDateEnd = dateString[1] ? dateString[1] + ' 23:59:59' : '';
 		},
 
 		// 重置
 		handlerReset() {
-      this.form = {}
+			this.form = {};
 			this.returnRange = null;
 			this.billRange = null;
 		},
@@ -191,15 +200,15 @@ export default {
 		},
 
 		//导出报表
-    exportExcel(){
+		exportExcel() {
 			let filter = {
-            ...this.form,
-        }
-        this.$apis.exportBackMoneyReport(filter).then(res => {
+				...this.form
+			};
+			this.$apis.exportBackMoneyReport(filter).then((res) => {
 				exportFile(res, '账单回款报表.xls');
-        })
+			});
+		}
 	}
-  },
 };
 </script>
 <style lang="less" scoped>

src/views/verification/collectionDetail.vue

@@ -3,10 +3,10 @@
 		<Goback ref="goback" title="回款详情" />
 		<a-tabs v-model="activeKey" @change="paneChange">
 			<a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title">
-				<a-form-model ref="form" :model="form">
+				<a-form-model ref="ruleForm" :model="form" :rules="rules">
 					<a-row :gutter="30">
 						<a-col :lg="7" :sm="12">
-							<a-form-model-item label="保险公司">
+							<a-form-model-item label="保险公司" prop="payorCode">
 								<a-select
 									v-model="form.payorCode"
 									placeholder="请选择保险公司"
@@ -25,7 +25,7 @@
 						</a-col>
 						<template v-if="activeKey === '0'">
 							<a-col :lg="5" :sm="12">
-								<a-form-model-item label="回款日期">
+								<a-form-model-item label="回款日期" prop="backDate">
 									<a-date-picker
 										format="YYYY-MM-DD"
 										format-value="YYYY-MM-DD 00:00:00"
@@ -38,7 +38,7 @@
 							</a-col>
 						</template>
 						<a-col :lg="6" :sm="12">
-							<a-form-model-item label="回款金额(人民币)">
+							<a-form-model-item label="回款金额(人民币)" prop="backAmountCny">
 								<a-input
 									type="number"
 									v-model="form.backAmountCny"
@@ -201,6 +201,7 @@
 											</a-table>
 										</div>
 									</template>
+									<div class="all-list_box no-data" v-else>暂未关联，前往全部账单关联</div>
 								</template>
 								<template v-else>
 									<!-- table -->
@@ -257,10 +258,6 @@ const panes = [
 	{ title: '基础信息', key: '0', show: true, content: 'PaymentClaims' },
 	{ title: '账单列表', key: '1', show: false, content: 'Insurance' }
 ];
-const panes1 = [
-	{ title: '已关联账单', key: '0', show: true, content: 'Associated' },
-	{ title: '全部账单', key: '1', show: false, content: 'Insurance' }
-];
 export default {
 	data() {
 		return {
@@ -288,9 +285,10 @@ export default {
 			selectedRowKeys: [], // Check here to configure the default column
 			selectedRows: [], // Check here to configure the default column
 			backMoneyNo: '',
-			editRules: {
-				backAmountUsd: [{ required: true, message: '请输入', trigger: 'blur' }],
-				backAmount: [{ required: true, message: '请输入', trigger: 'blur' }]
+			rules: {
+				payorCode: [{ required: true, message: '请选择保险公司', trigger: 'change' }],
+				backDate: [{ required: true, message: '请选择回款日期', trigger: 'change' }],
+				backAmountCny: [{ required: true, message: '请输入回款金额(人民币)', trigger: ['change', 'blur'] }]
 			},
 
 			searchForm: {
@@ -302,7 +300,6 @@ export default {
 			relatedList: [],
 
 			panes: Object.seal(panes),
-			panes1: Object.seal(panes1),
 			activeKey: '0',
 			activeKey1: '0',
 			statusOptions: [
@@ -324,34 +321,44 @@ export default {
 		BurtPagination
 	},
 	computed: {
+		panes1() {
+			const panes = [{ title: '已关联账单', key: '0', show: true, content: 'Associated' }];
+			if (this.isEdit) {
+				panes.push({ title: '全部账单', key: '1', show: false, content: 'Insurance' });
+			}
+			return panes;
+		},
 		columns() {
 			const base = [
 				{
-					title: '账单编号',
-					dataIndex: 'receiptNo',
+					title: '账单日期',
+					dataIndex: 'receiptDate',
 					ellipsis: true,
-					width: 150
+					width: 160,
+					fixed: 'left'
 				},
 				{
 					title: '账单状态',
 					dataIndex: 'status',
 					ellipsis: true,
-					width: 150,
+					width: 100,
+					fixed: 'left',
 					scopedSlots: { customRender: 'status' }
 				},
-				{ title: '病历号', dataIndex: 'mrnNo', ellipsis: true, width: 195 },
 				{
 					title: '客户姓名',
 					dataIndex: 'patientName',
 					ellipsis: true,
-					width: 160
+					width: 120,
+					fixed: 'left'
 				},
+				{ title: '病历号', dataIndex: 'mrnNo', ellipsis: true, width: 195 },
 				{ title: '保险公司', dataIndex: 'payorName', ellipsis: true, width: 195 },
 				{
-					title: '账单日期',
-					dataIndex: 'receiptDate',
+					title: '账单编号',
+					dataIndex: 'receiptNo',
 					ellipsis: true,
-					width: 180
+					width: 150
 				},
 				{
 					title: '收银',
@@ -416,14 +423,30 @@ export default {
 			};
 			base[10].customRender = (val, row) => {
 				return (
-					<a-input
+					<div>
+						{this.isEdit ? (
+							<a-popover title="备注" trigger="click">
+								<template slot="content">
+									<a-textarea
+										class="remark_inp"
 										v-model={row.remark}
+										auto-size={{ minRows: 3, maxRows: 5 }}
 										allow-clear
 										disabled={!this.isEdit}
-						onBlur={() => {
-							this.syncData(row);
-						}}
-					/>
+									></a-textarea>
+								</template>
+								<a-tooltip>
+									<template slot="title">{row.remark}</template>
+									<a-input v-model={row.remark} allow-clear disabled={!this.isEdit} />
+								</a-tooltip>
+							</a-popover>
+						) : (
+							<a-tooltip>
+								<template slot="title">{row.remark}</template>
+								<a-input v-model={row.remark} disabled />
+							</a-tooltip>
+						)}
+					</div>
 				);
 			};
 			base[11] = {
@@ -536,14 +559,6 @@ export default {
 		rowClassName(record) {
 			return record.hidden ? 'hide_' : '';
 		},
-		// 已关联账单数据同步
-		syncData(row, field) {
-			this.selectedRows.forEach((item) => {
-				if (item.id === row.id) {
-					item[field] = row[field];
-				}
-			});
-		},
 		// 账单查询
 		searchData() {
 			this._getNewEOBList();
@@ -554,12 +569,13 @@ export default {
 			return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 		},
 		paneChange() {
+			this.$refs.ruleForm[0].clearValidate();
 			this.panes.forEach((item) => {
 				item.show = false;
 			});
 			this.panes[Number(this.activeKey)].show = true;
 		},
-		changeAmount(row, field) {
+		changeAmount(row) {
 			let totalMoney = Number(this.form.backAmountCny || 0);
 			this.selectedRows.forEach((item) => {
 				totalMoney -= Number(item.backAmount);
@@ -570,7 +586,6 @@ export default {
 			if (Number(row.actualAmount || 0) - Number(row.backAmount || 0) < 0) {
 				this.$message.warning('录入账单回款金额大于账单金额');
 			}
-			this.syncData(row, field);
 		},
 		onSelectChange(selectedRow, selected) {
 			selectedRow['backAmount'] =
@@ -589,10 +604,16 @@ export default {
 			this.addNewEvt(0);
 		},
 		onSelectAll(selected, selectedRows, changeRows) {
-			console.log(selected, selectedRows, changeRows);
+			let chgRows = changeRows.map((item) => {
+				return {
+					...item,
+					backAmount:
+						this.residueBackAmount > item.currentReceiptAmount ? item.currentReceiptAmount : this.residueBackAmount
+				};
+			});
 			if (selected) {
 				this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map((item) => item.id));
-				this.selectedRows = this.selectedRows.concat(changeRows);
+				this.selectedRows = this.selectedRows.concat(chgRows);
 			} else {
 				changeRows.forEach((item) => {
 					const findIndex = this.selectedRowKeys.findIndex((rowId) => rowId === item.id);
@@ -601,6 +622,7 @@ export default {
 				});
 				this._confirmDelReceipt(changeRows);
 			}
+			this.addNewEvt(0);
 		},
 		delRecord(record, index) {
 			this.selectedRowKeys.splice(index, 1);
@@ -670,6 +692,10 @@ export default {
 		},
 		// 获取已关联的账单
 		getData() {
+			if (!this.backMoneyNo) {
+				this.$message.error('暂未关联账单，请在全部账单中添加账单');
+				return;
+			}
 			let billDate = this.searchForm.billDate || [];
 			this.$apis
 				.QUERYBACKRECEIPTLIST({
@@ -727,20 +753,16 @@ export default {
 		},
 		//新建/保存回款
 		addNewEvt(backStatus) {
-			return new Promise((resolve, reject) => {
 			if (!this.form.payorCode) {
 				this.$message.warning('请选择保险公司');
-					reject();
 				return;
 			}
 			if (!this.form.backDate) {
 				this.$message.warning('请选择回款日期');
-					reject();
 				return;
 			}
 			if (!this.form.backAmountCny) {
-					this.$message.warning('请输入回款金额');
-					reject();
+				this.$message.warning('请输入回款金额(人民币)');
 				return;
 			}
 			let receiptVoList = this.selectedRows.map((item) => {
@@ -751,13 +773,12 @@ export default {
 					remark: item.remark
 				};
 			});
-				const valid = receiptVoList.some((item) => {
+			const flag = receiptVoList.some((item) => {
 				const exist = !item.backAmount && item.backAmount !== 0;
 				return exist;
 			});
-				if (valid) {
+			if (flag) {
 				this.$message.warning('存在关联账单未输入回款金额');
-					reject();
 				return;
 			}
 
@@ -788,13 +809,10 @@ export default {
 					this._getNewEOBList();
 
 					// this.$router.go(-1);
-						resolve();
 				} else {
 					this.$message.error(res.returnMsg);
-						reject();
 				}
 			});
-			});
 		},
 
 		/* ======== 上传区域 ======== */
@@ -863,6 +881,12 @@ export default {
 .all-list_box {
 	height: calc(100vh - 430px);
 	overflow-y: auto;
+	&.no-data {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: red;
+	}
 }
 .table-content {
 	::v-deep {
@@ -902,6 +926,9 @@ export default {
 	::v-deep {
 		.ant-form-item {
 			display: flex;
+			&.ant-form-item-with-help {
+				margin-bottom: 0;
+			}
 		}
 		.ant-tabs {
 			flex: 1;
@@ -930,4 +957,7 @@ export default {
 		margin-bottom: 4px !important;
 	}
 }
+.remark_inp {
+	width: 300px;
+}
 </style>