diff --git a/src/components/Antd/index.js b/src/components/Antd/index.js index cd40e0787ec68160ce07fec8d5777d15099bcb93..76b2aa67da5d147e1a3d3bd2e6ac6e56fe7f052f 100644 --- a/src/components/Antd/index.js +++ b/src/components/Antd/index.js @@ -23,7 +23,8 @@ import { Collapse, Tabs, Tooltip, - Popover + Popover, + Empty } from "ant-design-vue"; export default () => { @@ -51,7 +52,8 @@ export default () => { Collapse, Tabs, Tooltip, - Popover + Popover, + Empty ]; // 注册 els.forEach((item) => { diff --git a/src/views/report/returnedMoney.vue b/src/views/report/returnedMoney.vue index 45854da25e81da074bc7d8c594913650f8013bbd..59062a01e1f3713257182de52815435587f39c7d 100644 --- a/src/views/report/returnedMoney.vue +++ b/src/views/report/returnedMoney.vue @@ -107,7 +107,7 @@ export default { { title: 'æ”¶é“¶', dataIndex: 'receiptTellerName', width: 120 }, { title: 'è´¦å•金é¢', dataIndex: 'actualAmount', width: 120 }, { title: '回款金é¢', dataIndex: 'paidAmountEob', width: 120 }, - { title: 'ä¸ªäººæ¬ è´¹', dataIndex: 'arrearsAmountShow', width: 120 }, + { title: 'ä¸ªäººæ¬ è´¹', dataIndex: 'arrearsAmount', width: 120 }, { title: '备注', dataIndex: 'remark', width: 180 }, { title: '回款日期', dataIndex: 'eobBackDate', width: 120 }, { title: '回款编å·', dataIndex: 'backMoneyNo', width: 120 }, diff --git a/src/views/verification/collectionDetail.vue b/src/views/verification/collectionDetail.vue index 756d1c604a6af118a35af9380e0a07307f790c08..bacc9073153cc0d90975daa5a0a36407756aebab 100644 --- a/src/views/verification/collectionDetail.vue +++ b/src/views/verification/collectionDetail.vue @@ -187,6 +187,7 @@ :rowClassName="rowClassName" :columns="selectedColumns" :data-source="selectedRows" + :rowKey="'id'" :scroll="{ x: '100%', y: tableHeight }" :pagination="false" > @@ -201,7 +202,7 @@ </a-table> </div> </template> - <div class="all-list_box no-data" v-else>暂未关è”,å‰å¾€å…¨éƒ¨è´¦å•å…³è”</div> + <div class="all-list_box no-data" v-else><a-empty :image="simpleImage" /></div> </template> <template v-else> <!-- table --> @@ -248,6 +249,7 @@ </template> <script> +import { Empty } from 'ant-design-vue'; import Goback from '@/components/CUSTOMER/goback'; import BurtPagination from '@/components/CUSTOMER/pagation'; import { EOBStatusOptions } from '@/utils/utilsdictOptions.js'; @@ -349,8 +351,8 @@ export default { title: '客户姓å', dataIndex: 'patientName', ellipsis: true, - width: 120, - fixed: 'left' + fixed: 'left', + width: 180 }, { title: '病历å·', dataIndex: 'mrnNo', ellipsis: true, width: 195 }, { title: 'ä¿é™©å…¬å¸', dataIndex: 'payorName', ellipsis: true, width: 195 }, @@ -510,7 +512,17 @@ 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; this.backMoneyNo = backMoneyNo; this.isEdit = isEdit; @@ -633,7 +645,6 @@ export default { } }, _confirmDelReceipt(records) { - console.log(records); if (!this.backMoneyNo) return; const receiptVoList = records .filter((item) => { @@ -645,7 +656,6 @@ export default { id: item.id }; }); - console.log(receiptVoList); if (receiptVoList.length === 0) return; this.$apis .DELETERECEIPTRECORD({ @@ -702,7 +712,6 @@ export default { pageNum: 1, pageSize: 999, 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 @@ -761,7 +770,7 @@ export default { this.$message.warning('请选择回款日期'); return; } - if (!this.form.backAmountCny) { + if (!this.form.backAmountCny && this.form.backAmountCny !== 0) { this.$message.warning('请输入回款金é¢(人民å¸)'); return; }