Merge branch 'func_eccs_2250' into 'master'

【商保系统】-回款管理-账单列表和已关联账单分tab展示支持搜索；回款单关联账单以及账单报表,增加备注列；其它优化项

See merge request !45

src/components/Antd/index.js

@@ -22,7 +22,9 @@ import {
   Spin,
   Collapse,
   Tabs,
-  Tooltip
+  Tooltip,
+	Popover,
+	Empty
 } from "ant-design-vue";
 
 export default () => {
@@ -49,7 +51,9 @@ export default () => {
     Spin,
     Collapse,
     Tabs,
-    Tooltip
+    Tooltip,
+		Popover,
+		Empty
   ];
   // 注册
   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,51 @@
 </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: 'arrearsAmount',
+				width: 120,
+				customRender: (val) => {
+					return <span style="color: red;">{val}</span>;
+				}
+			},
+			{
+				title: '备注',
+				dataIndex: 'remark',
+				width: 180,
+				customRender: (val) => {
+					return <span style="color: red;">{val}</span>;
+				}
+			},
+			{ 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 +150,11 @@ export default {
 				pageNum: 1,
 				pageSize: 10,
 				total: 0
-      },
+			}
 		};
 	},
 	components: {
-    BurtPagination,
+		BurtPagination
 	},
 	created() {
 		this.getList();
@@ -136,17 +163,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 +186,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 +214,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>