From 9913ec8459932ff57f31535f12d257daaf191028 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Sat, 25 Oct 2025 09:46:59 +0800 Subject: [PATCH 1/4] =?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=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emisWaybill/orderEntryAndReceiptPictureManagement.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue index ec01e490..02b297c0 100644 --- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue +++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue @@ -52,14 +52,15 @@ From 4cf06b61de0f893a4561225bffb4a9902812964d Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Sat, 25 Oct 2025 09:49:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AF=84=E4=BB=B6?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=A4=84=E7=90=86=E5=8D=95=E5=8F=B7=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/waybillRecord.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 28e58582..0711a0c3 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -2813,6 +2813,9 @@ methods: { }, //根据寄件国家处理单号格式 autoAjustBillCodeSender(code) { + if (!this.form.billCode) { + return; + } if (code === '0095' || code === '0855') { //如果单号是否包含7080 去掉首字母的T 否则保持不变 if (this.form.billCode.includes('7080')) { From 4b9fdf643d6bf820473e73bfc3e8a9430c5a4565 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 27 Oct 2025 13:31:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8A=A0=E5=A7=8B=E5=8F=91=E7=BD=91=E7=82=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/centerWaybillList.vue | 7 ++++++- src/views/emis/emisWaybill/dispatchWaybillList.vue | 9 +++++++-- src/views/emis/emisWaybill/sendWaybillList.vue | 7 ++++++- src/views/emis/emisWaybill/sendWaybillListNew.vue | 7 ++++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index b8d3019d..0cd5cc31 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -193,7 +193,9 @@ - + + + @@ -636,6 +638,7 @@ import EmisSiteMutiSelectPicker from '@/views/emis/EmisBaseTools/EmisSiteMutiSel import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; +import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue' import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue'; @@ -668,6 +671,7 @@ export default { EmisSiteMutiSelectPicker, EmisSiteSimplePicker1, EmisSiteSimplePicker2, + EmisSiteSimplePicker3, ProblemTypeMultiplePicker, TraceWaybillDetailView, @@ -863,6 +867,7 @@ export default { takePieceEmployeeCode: null, sendSiteCode: null, sendDate: null, + startSiteCode:null, dispatchManCode: null, dispatchDate: null, dispatchSiteCode: null, diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 9b766ce7..b9bbb99b 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -10,7 +10,7 @@
运单号 - +
- + + + @@ -613,6 +615,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; +import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue' import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue'; @@ -644,6 +647,7 @@ export default { EmisSiteSimplePicker1, EmisSiteSimplePicker2, + EmisSiteSimplePicker3, ProblemTypeMultiplePicker, TraceWaybillDetailView, @@ -819,6 +823,7 @@ export default { takePieceEmployeeCode: null, sendSiteCode: null, sendDate: null, + startSiteCode: null, dispatchManCode: null, dispatchDate: null, dispatchSiteCode: null, diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 60571114..201093b0 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -185,7 +185,9 @@ - + + + @@ -601,6 +603,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; +import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue' import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue'; @@ -642,6 +645,7 @@ export default { EmisSiteSimplePicker1, EmisSiteSimplePicker2, + EmisSiteSimplePicker3, ProblemTypeMultiplePicker, TraceDetail, @@ -821,6 +825,7 @@ export default { takePieceEmployeeCode: null, sendSiteCode: null, sendDate: null, + startSiteCode: null, dispatchManCode: null, dispatchDate: null, dispatchSiteCode: null, diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index 2d345095..ba793694 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -190,7 +190,9 @@ - + + + @@ -611,6 +613,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; +import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue' // import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'; import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue'; @@ -658,6 +661,7 @@ export default { EmisSiteSimplePicker1, EmisSiteSimplePicker2, + EmisSiteSimplePicker3, ProblemTypeMultiplePicker, TraceDetail, @@ -840,6 +844,7 @@ export default { takePieceEmployeeCode: null, sendSiteCode: null, sendDate: null, + startSiteCode: null, dispatchManCode: null, dispatchDate: null, dispatchSiteCode: null, From a61ab5270e7deb124bd8acbade1ec6688bb46ce8 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 27 Oct 2025 13:36:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/UserOrderList.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue index aabfd1a7..c0da72fb 100644 --- a/src/views/emis/emisWaybill/UserOrderList.vue +++ b/src/views/emis/emisWaybill/UserOrderList.vue @@ -1113,6 +1113,24 @@ export default { if (j === 'paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); } + if (j === 'orderStatus') { + return this.selectDictLabel(this.dict.type.emis_order_status,v[j]); + } + if (j === 'orderType') { + if(v[j] == 1){ + return '客户下单'; + }else{ + return '业务开单'; + } + } + //是否是问题件 + if(j=='blIsQuestion'){ + if(v[j] == 1){ + return '是'; + }else{ + return '否'; + } + } return v[j] })) },