From 0dcb21e552b3e1378323405f9f22e861f95cfb9e Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 17 Jul 2025 10:43:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=E3=80=81=E8=BF=90?= =?UTF-8?q?=E8=B4=B9=E8=AE=A1=E7=AE=97=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisWaybill/waybillIsPrinted.vue | 6 +- src/views/emis/emisWaybill/waybillModify.vue | 4 +- src/views/emis/emisWaybill/waybillRecord.vue | 59 ++++++++++++++++--- .../emisWaybillAjustApply/adjustPanel.vue | 4 +- 4 files changed, 59 insertions(+), 14 deletions(-) diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue index 1e40213b..8a96d15d 100644 --- a/src/views/emis/emisWaybill/waybillIsPrinted.vue +++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue @@ -162,7 +162,7 @@ - + @@ -293,11 +293,13 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue'; import { formatSearchStr,deepClone } from '@/utils/index' import {timeDiffTime,timeFormat} from '@/utils/dateUtils' +import TanexPrinterBatchPanel from "../EmisBaseTools/TanexPrinterBatchPanel.vue"; export default { name: "WaybillIsPrinted", components: { TanexPrinterPanel, + TanexPrinterBatchPanel, elDateAdvPicker, emisWaybillForm, CountryPicker1, @@ -577,11 +579,9 @@ export default { // batchPrint(orderList,tplCode,orderDetailList) if(printCnt){ - console.log("====printCnt==>",printCnt) for(let i=0; i - + - + diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index cfb16f77..63ec01dd 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -114,7 +114,7 @@ - + @@ -243,7 +243,7 @@
- +
@@ -307,7 +307,7 @@
- +
@@ -941,6 +941,32 @@ data() { callback(); } } + //校验寄件国家地区国家和省份是否匹配 + var checkSenderCountryProvince = (rule, value, callback) => { + console.log('value',value, this.form.sender.country , this.senderCountryCode) + if (this.form.sender.country && this.senderCountryCode) { + if (this.form.sender.country != this.senderCountryCode) { + callback(new Error('国家和省份不一致')); + } else { + callback(); + } + } else { + callback(); + } + } + //校验收件国家地区国家和省份是否匹配 + 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('国家和省份不一致')); + } else { + callback(); + } + } else { + callback(); + } + } return { activeNames:['1','2','3','4'], exchangeRate:null, @@ -971,7 +997,9 @@ data() { mainHasCnt:0, subHasCnt:0 }, - + //寄件人省份的国家 + senderCountryCode:null, + recieverCountryCode:null, // 表单校验 rules: { billCode: [ @@ -991,7 +1019,9 @@ data() { { required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] } ], province: [ - { required: true, message: "收货省不能为空", trigger: ["blur",'change'] } + { required: true, message: "收货省不能为空", trigger: ["blur", 'change'] }, { + validator: checkRecieverCountryProvince, trigger: ['blur', 'change'] + } ], company: [ { required: true, message: "收货公司不能为空", trigger: ["blur",'change'] } @@ -1017,7 +1047,10 @@ data() { { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change'] } ], province: [ - { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] } + { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] },{ + validator: checkSenderCountryProvince, trigger: ['blur', 'change'] + + } ], company: [ { required: true, message: "寄件公司不能为空", trigger: ["blur",'change'] } @@ -1992,7 +2025,6 @@ methods: { }, // 计算目的站点 handleCalcDestSite(){ - if(this.form.reciever.country != this.form.destinationCountry){ this.$confirm('收件国和目的国不一致,请调整！', '提示', { confirmButtonText: '确认', @@ -2474,6 +2506,19 @@ methods: { this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); } } + }, + //寄件省份变化 + onChangeSenderProvince(val){ + if(val){ + this.senderCountryCode = val.countryCode; + } + }, + //收件省份变化 + onChangeRecieverProvince(val){ + if(val){ + this.recieverCountryCode = val.countryCode; + } + this.handleCalcDestSite(); } } }; diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index 0d86d282..2ff2800e 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -234,7 +234,7 @@ - + @@ -251,7 +251,7 @@ - + From 030cec434de61acb86ac7f5753dc6e7ddbcd8a23 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 17 Jul 2025 10:44:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8E=A5=E5=8D=95=E5=8F=96=E4=BB=B6?= =?UTF-8?q?=E6=B4=BE=E4=BB=B6=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=E3=80=81?= =?UTF-8?q?=E8=BF=90=E8=B4=B9=E8=AE=A1=E7=AE=97=E5=8F=82=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/waybillGot.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue index fe63a334..b13b214c 100644 --- a/src/views/emis/emisWaybill/waybillGot.vue +++ b/src/views/emis/emisWaybill/waybillGot.vue @@ -113,12 +113,12 @@ - + - + @@ -2224,7 +2224,8 @@ methods: { sendSiteCode: this.form.sendSiteCode, dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode, customsClear:this.form.customsClear, - customsEclaration:this.form.customsEclaration + customsEclaration:this.form.customsEclaration, + startSiteCode:this.form.startSiteCode } From 1be934fb729f6209138499d3511253ee7b2bce63 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 17 Jul 2025 13:33:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E4=B8=8E=E7=9C=81?= =?UTF-8?q?=E4=BB=BD=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/EmisBaseTools/ProvincePicker.vue | 5 +- src/views/emis/emisWaybill/waybillModify.vue | 52 +++++++++++++-- src/views/emis/emisWaybill/waybillRecord.vue | 6 +- .../emisWaybillAjustApply/adjustPanel.vue | 63 +++++++++++++++++-- 4 files changed, 112 insertions(+), 14 deletions(-) diff --git a/src/views/emis/EmisBaseTools/ProvincePicker.vue b/src/views/emis/EmisBaseTools/ProvincePicker.vue index d1fa2024..dd65dbc3 100644 --- a/src/views/emis/EmisBaseTools/ProvincePicker.vue +++ b/src/views/emis/EmisBaseTools/ProvincePicker.vue @@ -81,8 +81,9 @@ methods: { }, onChange() { this.$emit("input", this.svalue); - this.$emit("onChange"); - }, + //传选中值对象 + let selItem = this.optionItems.find(item => item.regionCode == this.svalue); + this.$emit("onChange", selItem);}, queryData(val,key) { this.optionItems =[]; diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 26ff9e31..64092780 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -242,7 +242,7 @@
- +
@@ -306,7 +306,7 @@
- +
@@ -939,6 +939,31 @@ data() { callback(); } } + //校验寄件国家地区国家和省份是否匹配 + var checkSenderCountryProvince = (rule, value, callback) => { + if (this.form.sender.country && this.senderCountryCode) { + if (this.form.sender.country != this.senderCountryCode) { + callback(new Error('寄件国家和省份不一致')); + } else { + callback(); + } + } else { + callback(); + } + } + //校验收件国家地区国家和省份是否匹配 + 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('收件国家和省份不一致')); + } else { + callback(); + } + } else { + callback(); + } + } return { activeNames:['1','2','3','4'], exchangeRate:null, @@ -968,6 +993,9 @@ data() { subHasCnt:0 }, sendSiteSelectCount:0,//寄件网点变化次数 + //寄件人省份的国家 + senderCountryCode:null, + recieverCountryCode:null, // 表单校验 rules: { billCode: [ @@ -987,7 +1015,9 @@ data() { { required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] } ], province: [ - { required: true, message: "收货省不能为空", trigger: ["blur",'change'] } + { required: true, message: "收货省不能为空", trigger: ["blur",'change'] }, { + validator: checkRecieverCountryProvince, trigger: ['blur', 'change'] + } ], company: [ { required: true, message: "收货公司不能为空", trigger: ["blur",'change'] } @@ -1013,7 +1043,8 @@ data() { { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change'] } ], province: [ - { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] } + { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] },{ + validator: checkSenderCountryProvince, trigger: ['blur', 'change'] } ], company: [ { required: true, message: "寄件公司不能为空", trigger: ["blur",'change'] } @@ -2486,6 +2517,19 @@ methods: { this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); } } + }, + //寄件省份变化 + onChangeSenderProvince(val){ + if(val){ + this.senderCountryCode = val.countryCode; + } + }, + //收件省份变化 + onChangeRecieverProvince(val){ + if(val){ + this.recieverCountryCode = val.countryCode; + } + this.handleCalcDestSite(); } } }; diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 63ec01dd..d179d2dc 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -943,10 +943,9 @@ data() { } //校验寄件国家地区国家和省份是否匹配 var checkSenderCountryProvince = (rule, value, callback) => { - console.log('value',value, this.form.sender.country , this.senderCountryCode) if (this.form.sender.country && this.senderCountryCode) { if (this.form.sender.country != this.senderCountryCode) { - callback(new Error('国家和省份不一致')); + callback(new Error('寄件国家和省份不一致')); } else { callback(); } @@ -956,10 +955,9 @@ 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('国家和省份不一致')); + callback(new Error('收件国家和省份不一致')); } else { callback(); } diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index 2ff2800e..47394c34 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -634,7 +634,7 @@
- +
@@ -691,7 +691,7 @@
- +
@@ -1297,6 +1297,30 @@ export default { callback(); } } + //校验寄件国家地区国家和省份是否匹配 + var checkSenderCountryProvince = (rule, value, callback) => { + if (this.form.sender.country && this.senderCountryCode) { + if (this.form.sender.country != this.senderCountryCode) { + callback(new Error('寄件国家和省份不一致')); + } else { + callback(); + } + } else { + callback(); + } + } + //校验收件国家地区国家和省份是否匹配 + var checkRecieverCountryProvince = (rule, value, callback) => { + if (this.form.reciever.country && this.recieverCountryCode) { + if (this.form.reciever.country != this.recieverCountryCode) { + callback(new Error('收件国家和省份不一致')); + } else { + callback(); + } + } else { + callback(); + } + } return { triggerCount:0, activeNames:['1','2','3','4'], @@ -1314,6 +1338,9 @@ export default { masterBillProductType:null, // 表单参数 form:{}, + //寄件人省份的国家 + senderCountryCode:null, + recieverCountryCode:null, // 表单校验 rules: { billCode: [ @@ -1333,7 +1360,9 @@ export default { { required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] } ], province: [ - { required: true, message: "收货省不能为空", trigger: ["blur",'change'] } + { required: true, message: "收货省不能为空", trigger: ["blur",'change'] }, { + validator: checkRecieverCountryProvince, trigger: ['blur', 'change'] + } ], company: [ { required: true, message: "发件公司不能为空", trigger: ["blur",'change'] } @@ -1359,7 +1388,8 @@ export default { { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change'] } ], province: [ - { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] } + { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] },{ + validator: checkSenderCountryProvince, trigger: ['blur', 'change'] } ], company: [ { required: true, message: "发件公司不能为空", trigger: ["blur",'change'] } @@ -1498,6 +1528,7 @@ export default { this.applyTypeArr=[]; } console.log("====>this.applyTypeArr==>",this.applyTypeArr); + this.initCountryCode(); }, deep: true }, @@ -2140,6 +2171,30 @@ export default { this.form.startSiteCode = item.siteCode; this.form.startSiteName = item.siteName; }, + //寄件省份变化 + onChangeSenderProvince(val){ + console.log('onChangeSenderProvince',val) + if(val){ + this.senderCountryCode = val.countryCode; + } + }, + //收件省份变化 + onChangeRecieverProvince(val){ + console.log('val++++++',val) + if(val){ + this.recieverCountryCode = val.countryCode; + } + this.handleCalcDestSite(); + }, + //初始化选中省份的国家 + initCountryCode(){ + if(this.form.sender){ + this.senderCountryCode = this.form.sender.country; + } + if(this.form.reciever){ + this.recieverCountryCode = this.form.reciever.country; + } + } } }; From 1a706ddfc90ffe5206beecc787a5aa6694859191 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 17 Jul 2025 16:59:03 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E3=80=81=E7=BA=BF=E8=B7=AF=E3=80=81=E4=BA=A7=E5=93=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=81=9C=E7=94=A8=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmisBaseTools/AllMonthpayAccountPicker.vue | 2 +- src/views/emis/emisWaybill/centerWaybillList.vue | 14 ++++++++++---- .../emis/emisWaybill/dispatchWaybillList.vue | 15 ++++++++++----- src/views/emis/emisWaybill/sendWaybillList.vue | 15 +++++++++------ src/views/emis/emisWaybill/sendWaybillListNew.vue | 13 +++++++++---- 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue index 68edd668..3960f8b2 100644 --- a/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue +++ b/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue @@ -20,7 +20,7 @@ @click.native="onClick" @visible-change="reverseArrow" > - +