From 7e2583a8ddf13ae6a709dca813c760be8fa00dec Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 26 Aug 2025 17:55:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E7=BC=93=E5=AD=98=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/centerWaybillList.vue | 2 +- src/views/emis/emisWaybill/sendWaybillList.vue | 2 +- src/views/emis/emisWaybill/sendWaybillListNew.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index 4a615a00..b8d3019d 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -333,7 +333,7 @@ slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight)+'px'" - storageName="centerWaybillList_main_20250826" + storageName="centerWaybillList_main" ref="refTable" :row-key="rowKey" diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 33ae18c5..60571114 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -297,7 +297,7 @@ ref="refTable" row-key="id" - storageName="sendWaybillList_main_250825" + storageName="sendWaybillList_main_240702" :showStatInfo="true" v-loading="loading" diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index 317823e8..2d345095 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -307,7 +307,7 @@ :showStatInfo="true" ref="refTable" - storageName="sendWaybillListNew_main_250825" + storageName="sendWaybillListNew_main_240702" v-loading="loading" border From d83942efb6e97df4a43ccdf919c54b285488fbd6 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Wed, 27 Aug 2025 15:54:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisCustomerUser/monthUserForm.vue | 22 ++++++++++++++++--- .../emis/emisCustomerUser/monthUserList.vue | 19 ++++++++++++++-- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue index 44ba0576..b36d678e 100644 --- a/src/views/emis/emisCustomerUser/monthUserForm.vue +++ b/src/views/emis/emisCustomerUser/monthUserForm.vue @@ -93,13 +93,13 @@ - +
- + @@ -113,6 +113,16 @@ + + + + + + + + + + @@ -482,7 +492,13 @@ export default { } }); }, - + handleCountryChange(val){ + console.log('handleCountryChange',val); + if(val.code !== '0086'){ + this.form.enterpriseName = null; + this.form.enterpriseTaxId = null; + } + } } }; diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue index 39a4f97b..503f7acb 100644 --- a/src/views/emis/emisCustomerUser/monthUserList.vue +++ b/src/views/emis/emisCustomerUser/monthUserList.vue @@ -85,7 +85,20 @@ @input="handleQuery" /> - + + + + + + @@ -217,7 +230,9 @@ - + + + From 9c366d95f87a387a36943867433ddf5b256ef36d Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Wed, 27 Aug 2025 17:56:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=95=E5=85=A5=E3=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8D=95=E3=80=81=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E3=80=81=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=A8=8E?= =?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/waybillGot.vue | 37 ++++++++++++++++--- src/views/emis/emisWaybill/waybillModify.vue | 28 +++++++++++--- src/views/emis/emisWaybill/waybillRecord.vue | 26 +++++++++++-- .../emisWaybillAjustApply/adjustPanel.vue | 23 ++++++++++-- 4 files changed, 95 insertions(+), 19 deletions(-) diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue index 0c117dd6..27577d0a 100644 --- a/src/views/emis/emisWaybill/waybillGot.vue +++ b/src/views/emis/emisWaybill/waybillGot.vue @@ -257,12 +257,12 @@ {{ $t('寄件/签收短信') }} - + - + @@ -976,7 +976,10 @@ data() { mainHasCnt:0, subHasCnt:0 }, - + // 选中的寄件人企业名称 + selectedSenderEnterpriseName:null, + // 选中的寄件人企业税号 + selectedSenderEnterpriseTaxId:null, // 表单校验 rules: { billCode: [ @@ -1505,6 +1508,9 @@ methods: { ){ this.form.custNo=null; this.form.customerCode=null; + //企业税号重新赋值 + this.form.sender.enterpriseName=this.selectedSenderEnterpriseName; + this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId; this.calcBillFee(); } @@ -1522,6 +1528,10 @@ methods: { this.form.payee=item.payee; this.form.salesmen=item.salesmen; this.form.paymentType= '2'; + // 企业名称 + this.form.sender.enterpriseName=item.enterpriseName; + // 企业税号 + this.form.sender.enterpriseTaxId=item.enterpriseTaxId; }else{ this.form.paymentType= '1'; this.form.payee=null; @@ -2009,6 +2019,15 @@ methods: { // this.form.receiveTown=value.town; this.form.sender.address=value.address; this.form.sender.company=value.company; + // 选中的寄件人企业名称 + this.selectedSenderEnterpriseName=value.enterpriseName; + // 选中的寄件人企业税号 + this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId; + //企业税号 + if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){ + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + } }, onChangeSelectReceiver(value){ this.form.reciever.name=value.name; @@ -2020,10 +2039,16 @@ methods: { // this.form.receiveTown=value.town; this.form.reciever.address=value.address; this.form.reciever.company=value.company; - this.form.sender.enterpriseName=value.enterpriseName; - this.form.sender.enterpriseTaxId=value.enterpriseTaxId; this.form.sender.id = value.id; - + // 选中的寄件人企业名称 + this.selectedSenderEnterpriseName=value.enterpriseName; + // 选中的寄件人企业税号 + this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId; + //企业税号 + if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){ + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + } this.handleCalcDestSite(); }, diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 1bc36964..7340145a 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -259,12 +259,12 @@ {{ $t('寄件/签收短信') }} - + - + @@ -962,7 +962,6 @@ data() { } //校验收件国家地区国家和省份是否匹配 var checkRecieverCountryProvince = (rule, value, callback) => { - console.log('value',value, this.form.reciever.country , this.recieverCountryCode) if (this.form.reciever.country && this.recieverCountryCode) { if (this.form.reciever.country != this.recieverCountryCode) { callback(new Error('收件国家和省份不一致')); @@ -1005,6 +1004,10 @@ data() { //寄件人省份的国家 senderCountryCode:null, recieverCountryCode:null, + // 选中的寄件人企业名称 + selectedSenderEnterpriseName:null, + // 选中的寄件人企业税号 + selectedSenderEnterpriseTaxId:null, // 表单校验 rules: { billCode: [ @@ -1521,6 +1524,9 @@ methods: { ){ this.form.custNo=null; this.form.customerCode=null; + //企业税号重新赋值 + this.form.sender.enterpriseName=this.selectedSenderEnterpriseName; + this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId; this.calcBillFee(); } @@ -1541,6 +1547,10 @@ methods: { this.form.payee=item.payee; this.form.salesmen=item.salesmen; this.form.paymentType= '2'; + // 企业名称 + this.form.sender.enterpriseName=item.enterpriseName; + // 企业税号 + this.form.sender.enterpriseTaxId=item.enterpriseTaxId; }else{ this.form.paymentType= '1'; this.form.payee=null; @@ -2037,10 +2047,16 @@ methods: { this.form.sender.address=value.address; this.form.sender.company=value.company; this.senderCountryCode=value.country; - this.form.sender.enterpriseName=value.enterpriseName; - this.form.sender.enterpriseTaxId=value.enterpriseTaxId; this.form.sender.id = value.id; - + // 选中的寄件人企业名称 + this.selectedSenderEnterpriseName=value.enterpriseName; + // 选中的寄件人企业税号 + this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId; + //企业税号 + if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){ + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + } }, onChangeSelectReceiver(value){ this.form.reciever.name=value.name; diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 12cf8802..6f3c5e13 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -260,12 +260,12 @@ {{ $t('寄件/签收短信') }} - + - + @@ -1007,6 +1007,10 @@ data() { //寄件人省份的国家 senderCountryCode:null, recieverCountryCode:null, + // 选中的寄件人企业名称 + selectedSenderEnterpriseName:null, + // 选中的寄件人企业税号 + selectedSenderEnterpriseTaxId:null, // 表单校验 rules: { billCode: [ @@ -1521,6 +1525,9 @@ methods: { ){ this.form.custNo=null; this.form.customerCode=null; + //企业税号重新赋值 + this.form.sender.enterpriseName=this.selectedSenderEnterpriseName; + this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId; this.calcBillFee(); } @@ -1538,6 +1545,10 @@ methods: { this.form.payee=item.payee; this.form.salesmen=item.salesmen; this.form.paymentType= '2'; + // 企业名称 + this.form.sender.enterpriseName=item.enterpriseName; + // 企业税号 + this.form.sender.enterpriseTaxId=item.enterpriseTaxId; }else{ this.form.paymentType= '1'; this.form.payee=null; @@ -2029,11 +2040,18 @@ methods: { // this.form.receiveTown=value.town; this.form.sender.address=value.address; this.form.sender.company=value.company; - this.form.sender.enterpriseName=value.enterpriseName; - this.form.sender.enterpriseTaxId=value.enterpriseTaxId; this.form.sender.id = value.id; //校验数据初始化 this.senderCountryCode=value.country; + // 选中的寄件人企业名称 + this.selectedSenderEnterpriseName=value.enterpriseName; + // 选中的寄件人企业税号 + this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId; + //企业税号 + if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){ + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + } }, onChangeSelectReceiver(value){ this.form.reciever.name=value.name; diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index e079f211..a9bc7077 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -1355,6 +1355,10 @@ export default { //寄件人省份的国家 senderCountryCode:null, recieverCountryCode:null, + // 选中的寄件人企业名称 + selectedSenderEnterpriseName:null, + // 选中的寄件人企业税号 + selectedSenderEnterpriseTaxId:null, // 表单校验 rules: { billCode: [ @@ -1613,6 +1617,10 @@ export default { if(item!=null){ this.form.payee=item.payee; this.form.salesmen=item.salesmen; + // 企业名称 + this.form.sender.enterpriseName=item.enterpriseName; + // 企业税号 + this.form.sender.enterpriseTaxId=item.enterpriseTaxId; } this.calcBillFee() }, @@ -1771,10 +1779,16 @@ export default { // this.form.receiveTown=value.town; this.form.sender.address=value.address; this.form.sender.company=value.company; - this.form.sender.enterpriseName=value.enterpriseName; - this.form.sender.enterpriseTaxId=value.enterpriseTaxId; this.form.sender.id = value.id; - + // 选中的寄件人企业名称 + this.selectedSenderEnterpriseName=value.enterpriseName; + // 选中的寄件人企业税号 + this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId; + //企业税号 + if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){ + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + } }, onChangeSelectReceiver(value){ this.form.reciever.name=value.name; @@ -2223,6 +2237,9 @@ export default { ) { this.form.custNo = null; this.form.customerCode = null; + //企业税号重新赋值 + this.form.sender.enterpriseName=this.selectedSenderEnterpriseName; + this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId; this.calcBillFee(); }