From 12a843e49a0f7eec960d22dd643ad27a8460933f Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 12 Sep 2025 10:07:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BD=95=E5=8D=95=E5=92=8C=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87=E7=AE=A1=E7=90=86=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue index 3a6fdece..ec01e490 100644 --- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue +++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue @@ -335,7 +335,7 @@ export default { this.form.countryCode=item.code; }, onScanSiteSelect(item){ - this.queryParams.createSite=item && item.siteName; + // this.queryParams.createSite=item && item.siteName; // this.queryParams.createSiteCode=item && item.siteCode; }, onPreOrNextSiteSelect(item){ From e809bba7ada3a99a63f97ecb4b6307aab037f4e4 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 12 Sep 2025 13:50:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisWaybillAjustApply/adjustPanel.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index ea6bf8b0..eb8a0e6f 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -1523,6 +1523,19 @@ export default { oldValue: { handler (newValue, oldValue) { this.billDetail = this.oldValue; + if (['2', '4', '5'].includes(this.billDetail.paymentType)) { //月结 + this.selectedMonthUserEnterpriseName = this.billDetail.sender.enterpriseName; + this.selectedMonthUserEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId; + this.selectedSenderEnterpriseName = ''; + this.selectedSenderEnterpriseTaxId = ''; + } else { + this.selectedMonthUserEnterpriseName = ''; + this.selectedMonthUserEnterpriseTaxId = ''; + this.selectedSenderEnterpriseName = this.billDetail.sender.enterpriseName; + this.selectedSenderEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId; + } + this.senderCountryCode = this.billDetail.sender.country; + this.recieverCountryCode = this.billDetail.reciever.country; }, deep: true }, @@ -1541,7 +1554,7 @@ export default { this.form.blSpecialQuote='0'; } }, - deep: true + deep: true }, applyType: { handler (newVa, oldValue) { @@ -1667,8 +1680,6 @@ export default { console.log("====>this.oldValue==>",this.oldValue); console.log("====>this.form==>",this.form); this.billDetail=this.oldValue; - this.senderCountryCode = this.form.sender.country; - this.recieverCountryCode = this.form.reciever.country; }, getJsonData(){ if(this.form.packType&&this.form.packType.length>0){ From cd79407fb224ec5785689777fd6a432fbd9a9a76 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 12 Sep 2025 16:37:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A5=E5=8D=95=E6=9C=88=E7=BB=93?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AF=84=E4=BB=B6=E4=BA=BA=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/waybillGot.vue | 32 +++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue index 3e714b86..4e8e2a39 100644 --- a/src/views/emis/emisWaybill/waybillGot.vue +++ b/src/views/emis/emisWaybill/waybillGot.vue @@ -1528,9 +1528,9 @@ methods: { } } //企业税号重新赋值 - this.form.sender.enterpriseName=this.selectedSenderEnterpriseName; - this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId; - this.calcBillFee(); + this.form.sender.enterpriseName=this.selectedSenderEnterpriseName; + this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId; + this.calcBillFee(); } }, @@ -1705,17 +1705,17 @@ methods: { this.startTimer(); } - if (['2', '4', '5'].includes(this.form.paymentType)) { //月结 - this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName; - this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId; - this.selectedSenderEnterpriseName = ''; - this.selectedSenderEnterpriseTaxId = ''; - } else { - this.selectedMonthUserEnterpriseName = ''; - this.selectedMonthUserEnterpriseTaxId = ''; - this.selectedSenderEnterpriseName = this.form.sender.enterpriseName; - this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId; - } + // if (['2', '4', '5'].includes(this.form.paymentType)) { //月结 + // this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName; + // this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId; + // this.selectedSenderEnterpriseName = ''; + // this.selectedSenderEnterpriseTaxId = ''; + // } else { + // this.selectedMonthUserEnterpriseName = ''; + // this.selectedMonthUserEnterpriseTaxId = ''; + // this.selectedSenderEnterpriseName = this.form.sender.enterpriseName; + // this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId; + // } // }); // 获取企业税号 if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2 || this.form.mainUserId){ // 月结单 或者 月结客户现金单 或者 月结客户子账户现金单 @@ -1736,6 +1736,8 @@ methods: { if(res.rows.length > 0){ this.form.sender.enterpriseName = res.rows[0].enterpriseName; this.form.sender.enterpriseTaxId = res.rows[0].enterpriseTaxId; + this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName; + this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId; } }else{ // 非月结客户下的非月结单 if (this.form.sender.id) { @@ -1743,6 +1745,8 @@ methods: { if (res.data) { this.form.sender.enterpriseName = res.data.enterpriseName; this.form.sender.enterpriseTaxId = res.data.enterpriseTaxId; + this.selectedSenderEnterpriseName = this.form.sender.enterpriseName; + this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId; } } }