From 54b0b782d2006483b8dd659213eafe958a25ff45 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Sat, 21 Jun 2025 16:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=A7=8B=E5=8F=91=E7=BD=91=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/tpl/batch_import_order.xls | Bin 28160 -> 28672 bytes .../emis/emisWaybill/batchWaybillRecord.vue | 2 ++ .../emis/emisWaybill/centerWaybillList.vue | 1 + .../emis/emisWaybill/dispatchWaybillList.vue | 1 + .../emis/emisWaybill/sendWaybillList.vue | 1 + .../emis/emisWaybill/sendWaybillListNew.vue | 1 + src/views/emis/emisWaybill/waybillModify.vue | 26 +++++++++++++++++- src/views/emis/emisWaybill/waybillRecord.vue | 4 +-- 8 files changed, 33 insertions(+), 3 deletions(-) diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls index 0e8f868a9ed7ab05c60dba8f70c005c027c920a1..a45eb41a745f58eb2fcd4e9cad632ba4d30821cb 100644 GIT binary patch delta 1151 zcmaKrOK1~O6o&shnI=tQI!&KyC^jl$BB(|C^p)7ArmamMX>6K4)RwftQt`DAskWka zuXm#b7b~6_V*WGjX?^ ztIpcZvbvxQ+QJoXr?1#o3~9D_5qWS?GKL)BwA1}hdxbk?AI{9fa3%$$o(P`IO?Imn zS5M^fqnmPAo9f&=nUi<3N_dzNPQ>GtBs3824~;Rbpd97I%MSzF(l0N2%yrC%TSgup zwPgEC>xg#n zJDo*^jaoVzRk)FC&2+^KVvzW!uCToctvZ_oTT{$0cSX|ZV^<{2*KCNj7-CsZy0_Kf zZ8Nal5Pke$dbGpfon>If5S=`f9_BbD|_Fu_1xXJA*+Bgh~6onK2#4qNUT&s zPoWol=uyEy3W6*25QRM?6$-vd7`4ztAc0yWVbpeJ8&>9}xm^DDcka3WGk4}hqAc=( zJyp2tD1bk)SWF=;66yT8T;WI9#06zixt8?i?Cf$>Tvx{V`}1-~nNuB+*9|kv(KTih zd5T*uq^OD*aoNR)rpra`s#Cv}msgovnG3#<8-)isB0bBUIcoP{)J_EwPdnCs+-a6~ zvu540~9(uk(w<&VHY=QD}ph!!H$h0AeAypj{#xQ`=qm^pGghNg5y9v=>yWo zq-&%6l@v!OnGL z(9$P6JF2sTOisD9u8eK?(n{i@W~mmYwq6P-7e2YZZrZ+XW1;ZQCa6#{b7x%s~U+oTe|O z!@g(S)%&4xR+9XGuYD{v*iMlFYCnZh+ljyp1u1*XO TdbN5prpIFqa%xa#)5FSN)BoO# diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue index 82f143af..01f75442 100644 --- a/src/views/emis/emisWaybill/batchWaybillRecord.vue +++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue @@ -112,6 +112,7 @@ + @@ -510,6 +511,7 @@ export default { extInfo: element['附加信息'], blVirtual: element['是否虚拟单'], masterBillCode: element['关联主单'], + startSiteCode: element['始发网点'], uploadStatus: 0, errorInfo:'', } diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index b81600a1..e7afcabf 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -582,6 +582,7 @@ + diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index b5411210..c203d57d 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -582,6 +582,7 @@ + diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index d5ef0451..e8ccc53f 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -548,6 +548,7 @@ + diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index dd1a425b..4d275d4b 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -554,6 +554,7 @@ + diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 90d78fbc..f7dfc99a 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -170,6 +170,12 @@ {{ $t('寄件网点') }}: + + + + {{ $t('始发网点') }}: + +
@@ -1078,6 +1084,10 @@ data() { sendSiteCode: [ { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] } ], + //始发网点 + startSiteCode: [ + { required: true, message: "始发网点代码不能为空", trigger: ["blur",'change'] } + ], // sendDate: [ // { required: true, message: "发货时间不能为空", trigger: "blur" } // ], @@ -1622,6 +1632,8 @@ methods: { // this.form.sendDate = parseTime(new Date()); this.form.sendSiteCode=this.$store.getters.ownerSiteCode; this.form.sendSiteName=this.$store.getters.ownerSiteName; + this.form.startSiteCode = this.$store.getters.ownerSiteCode; + this.form.startSiteName = this.$store.getters.ownerSiteName; this.form.customsEclaration='1'; @@ -1800,14 +1812,26 @@ methods: { if(!item){ this.form.sendSiteCode = null; this.form.sendSiteName = null; + this.form.startSiteCode = null; + this.form.startSiteName = null; return; } this.form.sendSiteCode=item.siteCode; this.form.sendSiteName=item.siteName; - + this.form.startSiteCode=item.siteCode; + this.form.startSiteName=item.siteName; this.initGetTotalAvailablePag(this.form.sendSiteCode); // this.calcBillFee(); }, + onStartSiteSelect(item){ + if(!item){ + this.form.startSiteCode = null; + this.form.startSiteName = null; + return; + } + this.form.startSiteCode=item.siteCode; + this.form.startSiteName=item.siteName; + }, /** 提交按钮 */ submitForm() { this.form.sendDate =this.sendDate; diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index e78d9d31..ab1e15db 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -1813,8 +1813,8 @@ methods: { if(!item){ this.form.sendSiteCode = null; this.form.sendSiteName = null; - this.form.startSiteCode = ''; - this.form.startSiteName = ''; + this.form.startSiteCode = null; + this.form.startSiteName = null; return; } this.form.sendSiteCode=item.siteCode;