From dd0f66843c4bfc9602ab9664b49a0ef906ddf6a9 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 23 Sep 2025 09:21:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/CenterInvoiceHasOpenPanel.vue | 5 +++-- .../panel/CenterInvoiceRecordDealListPanel.vue | 5 +++-- .../panel/InvoiceRecordApplyListPanel.vue | 16 +++------------- .../panel/PayRecordInputByInvoice.vue | 5 +++-- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue index e0ff10e3..b43c0f64 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue @@ -211,13 +211,13 @@ 审核不通过 - + @@ -225,6 +225,7 @@ + - + @@ -217,6 +217,7 @@ + From 18f737693d89425156bd4bc8b6c7b803e07e1f53 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 23 Sep 2025 17:39:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E9=94=80=E8=B4=A6?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CancelAccountApplicationFormPanel.vue | 9 ++++++--- .../CancelAccountApplicationListPanel.vue | 17 +++++++++++------ .../panel/CancelAccountCheckListPanel.vue | 19 ++++++++++++------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue index 48615be4..62294993 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue @@ -4,7 +4,7 @@ class="overflowhidden"> - + @@ -31,9 +31,9 @@ - + + value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择交易时间" style="width:100%"> @@ -164,6 +164,9 @@ export default { form: {}, rules: { + picUrl: [ + { required: true, message: "请上传图片", trigger: ["blur", "change"] }, + ], payType: [ { required: true, message: "支付方式不能为空", trigger: ["blur", "change"] }, ], diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue index 55cde50d..e30b95cc 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue @@ -73,17 +73,22 @@ - + - - - + + - - + + + + + + diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue index 8363b989..56b2c88d 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue @@ -77,19 +77,24 @@ - + + + + - - + + - - + + - + From 411ea2e63bc5268a2561037c77cf1d803764bbe1 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 25 Sep 2025 16:26:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=B2=E5=BC=80=E7=A5=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=B7=B2=E6=94=B6=E6=AC=BE=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E5=8F=91=E7=A5=A8=E6=94=B6=E6=AC=BE=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue index b43c0f64..27f00c4a 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue @@ -420,7 +420,7 @@ export default { if(this.selectList&&this.selectList.length>0){ for(let i=0;i Date: Thu, 25 Sep 2025 17:53:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86=E6=94=B6=E6=AC=BE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/CenterInvoiceHasOpenPanel.vue | 1 + .../panel/PayRecordInputByInvoice.vue | 21 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue index 27f00c4a..9be01926 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue @@ -48,6 +48,7 @@ + diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue index 697562fe..c0d2771c 100644 --- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue +++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue @@ -133,7 +133,7 @@ 收款金额 - + @@ -244,12 +244,12 @@
- 确 定 + 确 定 取 消
-
+
@@ -446,9 +446,9 @@ export default { this.form.payInvoiceRelList.push({applySeqNo:itemBill.applySeqNo}); } - totalFee=origFee; + // totalFee=origFee; - this.form.payMoney = totalFee.toFixed(2); + // this.form.payMoney = totalFee.toFixed(2); this.form.settleBillNo=settleBillNoListStr; @@ -461,7 +461,6 @@ export default { hasPayMap[item.billNo] = item.sumMoney } } - console.log("===>hasPayMap==>",hasPayMap); let qParam={ applySeqNo: applySeqNoListStr, @@ -471,14 +470,12 @@ export default { // 查询子账单 let res=await listEmisSettleInvoiceRel(qParam); - console.log("===>=res==>",res) if(res.code==200){ res.rows.forEach(itemSubBill=>{ let relItem={...itemSubBill}; relItem.openMoney=itemSubBill.money; relItem.payMoney=itemSubBill.money; relItem.hasApplyFee=0; - console.log("===>=hasPayMap1111==>",hasPayMap[itemSubBill.billNo]) if(relItem.waybillDetail.paymentType == 2 || relItem.waybillDetail.paymentType == 4 || relItem.waybillDetail.paymentType == 5){ that.form.settleType='2'; @@ -491,15 +488,17 @@ export default { if(this.form.recType==1){ relItem.hasApplyFee=hasPayMap[itemSubBill.billNo]; // relItem.payMoney=itemSubBill.money-hasPayMap[itemSubBill.billNo]; + relItem.payMoney=itemSubBill.money-itemSubBill.recedMoney; } } - + if(relItem.payMoney>0){ + totalFee = Number(totalFee) + Number(relItem.payMoney); this.form.payRelList.push(relItem); } }); - } + this.form.payMoney = totalFee.toFixed(2); // this.handleCalcFeeItem(); }else{