From 44533872eec4b601dbf5165e2d3ed07f3b5bb337 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 28 Oct 2025 11:45:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=94=80=E8=B4=A6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CancelAccountApplicationFormPanel.vue | 53 +++++++++++++++---- .../CancelAccountApplicationListPanel.vue | 20 ++++++- .../panel/CancelAccountBillList.vue | 29 ++++++++-- .../panel/CancelAccountCheckListPanel.vue | 20 ++++++- .../panel/CancelAccountDetail.vue | 2 +- 5 files changed, 108 insertions(+), 16 deletions(-) diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue index 62294993..b1e0c54a 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue @@ -25,11 +25,6 @@ - - - - - +
@@ -120,6 +136,8 @@ import { uploadFile } from '@/api/common'; import { queryByBillCodes, writeoffApply, getWriteoffApply, updateWriteoffApply } from "@/api/emis/emisSettleCancelAccount"; import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; +import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; +import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue'; export default { name: "cancelAccountApplicationFormPanel", @@ -141,7 +159,7 @@ export default { default: '' } }, - components: { uploadFile, EmpNamePicker }, + components: { uploadFile, EmpNamePicker, EmpNamePicker1, AllMonthpayAccountPicker }, dicts: [ 'emis_payment_type', 'emis_settlebill_pay_type'], data() { return { @@ -161,8 +179,9 @@ export default { // 总条数 total: 0, // 新增/修改弹窗数据 - form: {}, - + form: { + settleType: null, + }, rules: { picUrl: [ { required: true, message: "请上传图片", trigger: ["blur", "change"] }, @@ -174,7 +193,7 @@ export default { { required: true, message: "销账金额不能为空", trigger: ["blur", "change"] }, ], recipient: [ - { required: true, message: "收款人不能为空", trigger: ["blur", "change"] }, + { required: true, message: "缴款客户/缴款人不能为空", trigger: ["blur", "change"] }, ], tradeDate: [ { required: true, message: "交易日期不能为空", trigger: ["blur", "change"] }, @@ -215,6 +234,17 @@ export default { }; }, + watch: { + //监听waitBatchDtlList变化 + 'waitBatchDtlList': { + handler(newVal, oldVal) { + if (newVal.length > 0) { + this.form.settleType = newVal.some(item => item.emisSettleBill.settleType === '2') ? '2' : '1'; + } + } + }, + deep: true + }, created() { this.initData(); }, @@ -424,6 +454,11 @@ export default { dateTimeChange(value) { this.dateTimeRange = value; }, + onMonthpayAccountSelect(account) { + if(account){ + this.form.recipient = account.custName; + } + } } }; diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue index 62fb500c..946296c2 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue @@ -69,6 +69,25 @@ + + + + + + + + + + @@ -91,7 +110,6 @@ - diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue index d5f8dd6a..79b06272 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue @@ -12,14 +12,23 @@ @selection-change="handleSelectionChange" @sort-change="handleSortChange" > - + + :show-overflow-tooltip="true" > + + - + + + + @@ -34,6 +43,18 @@ + + + + + + +
@@ -57,7 +78,7 @@ export default { } }, components: { elDateSimplePicker,PayRecordSubBillRelList }, - dicts: ['emis_settlebill_pay_type','emis_payment_type'], + dicts: ['emis_settlebill_pay_type','emis_payment_type','emis_settlebill_pay_status',], data() { return { // 遮罩层 diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue index 71a7a10f..16c8fd0d 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue @@ -77,6 +77,25 @@ + + + + + + + + + + @@ -99,7 +118,6 @@ - diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue b/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue index 3978131e..ef91cc8e 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue @@ -6,7 +6,7 @@ - ￥{{ settleBillItem.writeoffAmount }} + ￥{{ settleBillItem.writeoffAmount }} {{ settleBillItem.recipient }} From 39b3a5ba67ea7a722af5703d2f1d91ccabba101a Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 28 Oct 2025 13:56:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisSettleBill/panel/CancelAccountBillList.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue index 79b06272..2fb13ce4 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue @@ -48,10 +48,13 @@ - +