From e96b317d9aeae97b83a2ab5fa6f9699b94066b4c Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 25 Aug 2025 16:08:28 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=BD=95=E5=8D=95=E3=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8D=95=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E5=8A=A0=E4=BC=81=E4=B8=9A=E7=A8=8E?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/tpl/batch_import_order.xls | Bin 28672 -> 40448 bytes .../CustomerAddressSimplePicker.vue | 2 ++ .../emis/emisWaybill/batchWaybillRecord.vue | 6 ++++++ src/views/emis/emisWaybill/waybillGot.vue | 14 +++++++++++++- src/views/emis/emisWaybill/waybillModify.vue | 15 ++++++++++++++- src/views/emis/emisWaybill/waybillRecord.vue | 16 ++++++++++++++-- .../emisWaybillAjustApply/adjustPanel.vue | 18 ++++++++++++++++++ 7 files changed, 67 insertions(+), 4 deletions(-) diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls index 0c91af160db9e71ed99573c5d265090e239d0cf2..dab07786f87f7de7f93c69fdda5846d3d8a2af02 100644 GIT binary patch delta 10756 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 ACjbBd diff --git a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue index 2ffbe65f..0bcd5d58 100644 --- a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue @@ -26,6 +26,8 @@ + + + + @@ -240,6 +242,8 @@ export default { sendCounty: null, sendTown: null, sendAddress: null, + enterpriseName: null, + enterpriseTaxId: null, sendPostcode: null, sendPcd: null, paymentType: null, @@ -487,6 +491,8 @@ export default { sendCity:element['寄件市'], sendCounty:element['寄件区'], sendAddress: element['寄件地址'], + enterpriseName: element['企业名称'], + enterpriseTaxId: element['企业税号'], paymentType: element['支付方式'], calcFeeType: element['计费方式'], transLineType: element['线路'], diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue index db5f41b2..0c117dd6 100644 --- a/src/views/emis/emisWaybill/waybillGot.vue +++ b/src/views/emis/emisWaybill/waybillGot.vue @@ -257,7 +257,16 @@ {{ $t('寄件/签收短信') }} - + + + + + + + + + + @@ -2011,6 +2020,9 @@ 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.handleCalcDestSite(); diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 3ab5d4d3..1bc36964 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -259,7 +259,16 @@ {{ $t('寄件/签收短信') }} - + + + + + + + + + + @@ -2028,6 +2037,10 @@ 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; + }, 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 b589f1f4..12cf8802 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -260,7 +260,16 @@ {{ $t('寄件/签收短信') }} - + + + + + + + + + + @@ -1995,7 +2004,7 @@ methods: { }, // 弹出地址簿选择 - handleSelectCustomerAddress(addressType){ + handleSelectCustomerAddress(addressType){ this.addressType = addressType; this.titleSelectAddress = this.addressType==1? this.$t('选择寄件人'):this.$t('选择收件人'); this.openSelectAddress = true; @@ -2020,6 +2029,9 @@ 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; }, diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index f8411c80..e079f211 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -608,6 +608,9 @@ {{ billDetail.sender.cityName }} {{ billDetail.sender.countyName }} {{ billDetail.sender.address }} + {{ billDetail.sender.enterpriseName }} + {{ billDetail.sender.enterpriseTaxId }} + @@ -645,6 +648,17 @@ + + + + + + + + + + + @@ -1757,6 +1771,10 @@ 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; + }, onChangeSelectReceiver(value){ this.form.reciever.name=value.name; From 0488e44a0d77d55fe33a42427dd8daa5ec7d44e5 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 25 Aug 2025 16:38:50 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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/emisWaybill/sendWaybillList.vue | 24 ++++++++++++++++-- .../emis/emisWaybill/sendWaybillListNew.vue | 25 +++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index e46716b9..33ae18c5 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -107,6 +107,23 @@ + + + + + + + 不发送 - + + @@ -723,6 +741,8 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, + enterpriseName: null, + enterpriseTaxId: null, paymentType: null, blVirtual: null, calcFeeType: null, diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index c07fb849..317823e8 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -110,6 +110,23 @@ + + + + + + + 不发送 - + + @@ -741,6 +760,8 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, + enterpriseName: null, + enterpriseTaxId: null, paymentType: null, blVirtual:null, calcFeeType: null, From 7a08a9abf1e5d57f615612604ab631b16c1421bd Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 25 Aug 2025 16:42:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B4=BE=E4=BB=B6=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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/emisWaybill/dispatchWaybillList.vue | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 09708d82..690b9a45 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -107,6 +107,23 @@ + + + + + + + - + + @@ -743,6 +761,8 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, + enterpriseName: null, + enterpriseTaxId: null, paymentType: null, calcFeeType: null, custNo: null, From 245fd9b92e88ff4e21e6f60be5bc4ae42fcb9dd9 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 25 Aug 2025 16:42:40 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=A8=8E=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/waybillDetailReadOnly.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue index eac4c130..23eb8e2c 100644 --- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue +++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue @@ -50,6 +50,9 @@ {{ form.sender.company }} {{ form.sender.countryName }} {{ form.sender.provinceName }} {{ form.sender.cityName }} {{ form.sender.countyName }} {{ form.sender.address }} + {{ form.sender.enterpriseName }} + {{ form.sender.enterpriseTaxId }} + {{ form.reciever.name }} {{ form.reciever.phone }} From a2d14a90fc53b1c14def5d3e620b12581759e379 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 25 Aug 2025 17:23:36 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E4=BA=BA=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=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 --- .../emisCustomerAddress/senderAddressForm.vue | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/views/emis/emisCustomerAddress/senderAddressForm.vue b/src/views/emis/emisCustomerAddress/senderAddressForm.vue index 2b916194..1f36b47a 100644 --- a/src/views/emis/emisCustomerAddress/senderAddressForm.vue +++ b/src/views/emis/emisCustomerAddress/senderAddressForm.vue @@ -29,7 +29,7 @@ - + @@ -47,6 +47,16 @@ + + + + + + + + + + @@ -215,6 +225,9 @@ export default { updateTime: null, remark: null, parseAddress:null, + enterpriseName: null, + enterpriseTaxId: null, + }; this.resetForm("form"); }, @@ -236,6 +249,13 @@ export default { } }); }, + handleCountryChange(val){ + if(val !== '0086'){ + this.form.enterpriseName = null; + this.form.enterpriseTaxId = null; + } + } + } }; From 4ea91f47befed64c4deb433ff72a7f6821e12153 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 25 Aug 2025 17:33:40 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E4=BA=BA=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=88=97=E8=A1=A8=E5=8A=A0=E4=BC=81=E4=B8=9A=E7=A8=8E?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emisCustomerAddress/senderAddress.vue | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue index 6bfae3a6..1df57d26 100644 --- a/src/views/emis/emisCustomerAddress/senderAddress.vue +++ b/src/views/emis/emisCustomerAddress/senderAddress.vue @@ -40,17 +40,17 @@ slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight)+'px'" - - v-loading="loading" - border - size="small" - :data="emisCustomerAddressList" - :showSearch.sync="showSearch" - :queryParams="queryParams" - :total="total" - @queryTable="getList" - @selection-change="handleSelectionChange" - @sort-change="handleSortChange" + storageName="senderAddress_main_250825" + v-loading="loading" + border + size="small" + :data="emisCustomerAddressList" + :showSearch.sync="showSearch" + :queryParams="queryParams" + :total="total" + @queryTable="getList" + @selection-change="handleSelectionChange" + @sort-change="handleSortChange" >
@@ -139,6 +139,9 @@ + + + From 06879848c1d05d271fc23ae0f01298614f9e5fce Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 26 Aug 2025 11:32:25 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E4=BA=BA=20=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=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 --- .../EmisBaseTools/EmisMonthpayAccountPicker.vue | 1 - .../emis/emisCustomerAddress/senderAddress.vue | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue index 413b79c3..0a966085 100644 --- a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue +++ b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue @@ -101,7 +101,6 @@ this.bakOptionItems=[]; this.optionItems=[]; listSimpleEmisMonthpayAccount(queryParams).then(response => { - console.log('response',response.rows); this.loading = false; this.bakOptionItems = response.rows; this.optionItems =this.bakOptionItems; diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue index 1df57d26..4a4d0f06 100644 --- a/src/views/emis/emisCustomerAddress/senderAddress.vue +++ b/src/views/emis/emisCustomerAddress/senderAddress.vue @@ -32,7 +32,22 @@ - + + + + + + + + From c5e6f5a51fc92e5d19d1a013d0a82cebd192cd18 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 26 Aug 2025 11:35:24 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B4=BE=E4=BB=B6=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BC=81?= =?UTF-8?q?=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/emisWaybill/dispatchWaybillList.vue | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 690b9a45..9b766ce7 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -107,23 +107,6 @@ - - - - - - - - - @@ -761,8 +742,6 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, - enterpriseName: null, - enterpriseTaxId: null, paymentType: null, calcFeeType: null, custNo: null, From c7b7413fae67492614bf7669cc84f4cf6539e220 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 26 Aug 2025 13:38:47 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=BF=90=E5=8D=95?= =?UTF-8?q?=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/emisWaybill/centerWaybillList.vue | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index 1d9bd6b2..4a615a00 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -114,6 +114,22 @@ + + + + + + 不发送
 - + + @@ -767,6 +784,8 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, + enterpriseName: null, + enterpriseTaxId: null, paymentType: null, calcFeeType: null, custNo: null,