Merge branch 'func_eccs_2250' into test

src/views/verification/collectionDetail.vue

@@ -233,6 +233,14 @@
 														text == 1 ? '有效' : text == 2 ? '无效' : ''
 													}}</span>
 												</template>
+												<template slot="patientName" slot-scope="text">
+													<a-tooltip placement="top">
+														<template slot="title">
+															<span>{{ text }}</span>
+														</template>
+														<span class="ellipsis_">{{ text }}</span>
+													</a-tooltip>
+												</template>
 												<template slot="operation" slot-scope="text, record, index">
 													<a-button type="link" class="danger" @click.stop="delRecord(record, index)">删除</a-button>
 												</template>
@@ -263,6 +271,14 @@
 														text == 1 ? '有效' : text == 2 ? '无效' : ''
 													}}</span>
 												</template>
+												<template slot="patientName" slot-scope="text">
+													<a-tooltip placement="top">
+														<template slot="title">
+															<span>{{ text }}</span>
+														</template>
+														<span class="ellipsis_">{{ text }}</span>
+													</a-tooltip>
+												</template>
 											</a-table>
 											<BurtPagination class="pagination" :pagination="pagination" @pageChange="pageChange" />
 										</div>
@@ -390,7 +406,8 @@ export default {
 					dataIndex: 'patientName',
 					ellipsis: true,
 					fixed: 'left',
-					width: 180
+					width: 180,
+					scopedSlots: { customRender: 'patientName' }
 				},
 				{ title: '病历号', dataIndex: 'mrnNo', ellipsis: true, width: 195 },
 				{ title: '保险公司', dataIndex: 'payorName', ellipsis: true, width: 195 },
@@ -489,7 +506,7 @@ export default {
 						) : (
 							<a-tooltip>
 								<template slot="title">{row.remark}</template>
-								<a-input v-model={row.remark} disabled />
+								<a-input class="red_inp" v-model={row.remark} disabled />
 							</a-tooltip>
 						)}
 					</div>
@@ -557,6 +574,15 @@ export default {
 			return Number(totalMoney.toFixed(2));
 		}
 	},
+	watch: {
+		activeKey1() {
+			this.searchForm = {
+				billDate: [],
+				mrnNo: '', // 病历号
+				patientName: '' // 客户名字
+			};
+		}
+	},
 	created() {
 		this.simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
 		const { backMoneyNo, isEdit } = this.$route.query;
@@ -610,8 +636,11 @@ export default {
 		},
 		// 账单查询
 		searchData() {
+			if (this.activeKey1 === '1') {
 				this._getNewEOBList();
+			} else {
 				this.getData();
+			}
 		},
 		// 选择框筛选
 		filterCode(input, option) {
@@ -1014,16 +1043,19 @@ export default {
 	width: 300px;
 }
 .red_inp {
+	color: red !important;
 	::v-deep .ant-input {
 		color: red;
 	}
 }
-
-@media screen and (min-width: 1920px) {
-	.all-list_box {
-		height: calc(100vh - 420px);
-	}
+.ellipsis_ {
+	display: block;
+	max-width: 148px;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
 }
+
 @media screen and (min-width: 1920px) {
 	.all-list_box {
 		height: calc(100vh - 420px);