From 0d180a5484ec4be7a6dd977d93ba2c2f897278f7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 31 Dec 2024 07:53:42 +0800
Subject: [PATCH] md

---
 public/static/tpl/batch_import_order.xls      | Bin 24064 -> 24576 bytes
 .../oms/emisWaybill/BatchOrderRecord.vue      |   2 ++
 src/views/oms/emisWaybill/OrderRecord.vue     |  14 +++++++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls
index 05376fc4efd14ccb6ec5792484f8ad614b4c35dc..06e9300bdc3921e9094ee043e35d328b90c43d9a 100644
GIT binary patch
delta 2873
zcmd6pU2IfE6vxlpZnw*J+q+wK%Wk{dz3uYZ0+s@bYiYN9?cFYPOCe^_`bET`KGY~7
z5`l$86JjJGo$!&E2r<!^7-QrnyeM^_^i_G#@MdBHCO+82j~KeR{?DD;X#gMkLgKx-
zGxIy=%$d1!XU@5&z7nUZ;#|MAmb@!W)Q6_P^H05AXX$!8U+n!{$hx>G-g9mmpN4_~
z+5nq2qNF@(ey~3{kH;gCoRzc4-)a3sQPO7fa-({$e9*IhP#%_6*pge!c>H)EO2-2{
zllg0celFJkcFN%^t@23MO0i4+-qk1aGMyfl@1~P-$O?;soa*Y7t?95Bg*+vzZ9Zwn
zLo#fwccr`8TI_*UpBQt?l3R|u<zA;`eU#{!*~&xu#XdSrhj1Ukd%i<q3KnH+Hn-|c
zGKpqibEoB>wYjzkFHL0N;WgyvqU<hhlvlE)77OYc?QAGQT5xLFm@xe$-oEtl$?x~A
zI{Vk5Kh8UmK~t<*N@9TeX@EA-I*d4gvLChOwzFvWlPaaP^%q}(rm`|LG!Q$JCu+ga
zf<h=?#N;pyIaS>1oEv(@cy2Db69ONdfI5ZyL}-WRE=p5j$pTx{P37<c_fQXg8(H8C
zWr)lLUQTneFp{d&@MZx6n+R8pzT;(}s@Uercr9vlm@CM(yD~PY(etj1gz3r}?vvf6
zAa|i%ZmCF6-d$To28cb~t+=KQKz5>(K9EmSBaKp{CO^opsR`7iDS&?bDV3Kcpe34u
zAfA-cHG`U6s<1Ew3~6NxoVI9c1+{82LD)f_n=tzE$|<K2P()K32&c`{Ed?#r6a_^U
zRZzu%F|BL|wQE`iTBa!uifc-M5}G<d9hy2potl!go06JR(4{=W_+7v*txSW`nk<l|
zsT*IkTT>5oJ(@CD8SF5cp=;P1%W3c8?#klK9-38Uk@I|56Zl`f{~QSe;SFEWcK5A7
z+s3yfYA{;SHb963!{3x|jPRZpIJ7pcfJ~7Ov=TJq>KZ{d4y)2Np}k6520*Ks`1}i;
zQ=8TRPZ~@?(5+jEKGm@q)T=v&K%DN>5G^1Z$5UCFXmeUr6b7x+6ajHsRJu0MBQD|m
z3!F?F0eW5;1#Qq20}W_u2W<ph$1xN*n7kgd!(8^}Y)Im{gf~P7benX)PS9peN!mk?
zDypDU3d+ZT*AXxTjw0OUPUV#AwCB!(bPH_M2kHi?H|as^aV^i#I96uN4Xp)Q%w2iV
zXzad@8P_F;=Lc;UBPmjeiud%*(2t0>FCmT(`sr#zRZPgQ^9gZ5-pm(KuCV(u7KY=C
z!wqjpqR1?l&maWFuuf6BAm6a_qD_8juS9(2=%(zFN%@=o;WEybEaKWn^*Yxx;#K)V
zA?92!jEZK9ELVYAwiWHz>tp|si=C-r-l$~ZiI<!Gne>E5JlqHkdc@hxB>wwgOI|IL
zhCJf*Wzw)moW4x=W3nZuFOzbfF5uFLN1VP)+IG-Go`6Z)J>vXj(hiR}VVShkBTiVR
z-hO;^O*a|yfSkTegl;uaPG2}T&c(5ph3qe_o*r*+x?ohV-MTvAq{e%V2E+ilZDMop
z<=c4QYQ0wX>dQ@vFE*<B@@;s6UXVOJF$`C6S)Di=+4TO2qrd(ja!`^#I9q<&d3N7H
zV|sFJlz&!v)@rWm=T+t=<IeskKM~XABaN$}tjc5Mig9O5-YK6HH{`JcZ;6on^FYPV
k^FAY-(@#}|JeO^np1hRc=)z7pkZ{1@Hb3i}&n8RaU$>*xJOBUy

delta 2539
zcmchZO>7%Q6vy9e96O2a>^h0vII(NTrKH5Aq~WXJq;{JoTRVyJp;n3#6h(zYkq{t(
zkSa(wK^!=M6fzg6DyUFZpgoXuqn>D$6Xh6jDCz~Zmx6$Ug~TOJYW{C`J5ehx2$Z#E
zXMS&H-n^Ne_nzn1#Qb++u{)h5?=gtF&=e^5tJNw?pF~+1|5nJVxGh%g+uD_oJg+ax
zUOl5lB68Vi^N-Nn-s~NF-MG*wXVWcmIn^Wv<#akJ@1!!ql=)OvYUzY5r43PpJTFR)
z>>OkVQid1?#qITukK$UaSI*>OT2E2FlPh$-Njg#aG@C*Ga)GM^Q2>>O!d7y5U*64S
zrO`VYPEm?BDO^*8)U;pgjS73QPZ#os!@v4WsveT7`JU+V08tnU1cmT^1xui9SMpzJ
zqjRBS03XevD@nVlSij9FO4FpV%^lQ1HzV7ep$w6}&3kA=ivFZkfh~0!4i-;^*4c1c
z6Gt5xTVJ8mTtU|F$ap}7W*r#`-I3KiBHN+{o<i6O9+w0SI;Y{124YQHmNT>l$V%K!
zAIPVumWouX$Pe->3V`^y-FbDGSEr~RRIjK3#74OzgP@>877Ihbkm?LWX;@Jss8Nv)
z!Z-KS7?{T==PHeWB8r+oO^TX9&5Bw;EiPH8qQI!?jDcc`c7b*&Y6Z0_ii6^c+CXiJ
z+ClA#5+K}6&(I_&=}`ya9u1;A=uCl9iqbS7a|7*Gk#7&(plkT<duV8<f7VVf_{e(J
zj_>$k1OEH|H%MrH#{o^}76`OWd`hAktr2Yv1SijbKl$SkzRm*vXwqZeMX&@M(xko4
z9pKJdkO@b0hX&Ao+#4$3f+lq;st4@@oz-|=1L)qpc-Ea41U;cfhCm$MZ#c_`K_)!U
z8EL`kOyV@)PBcLK6-7Xt2Hd_T&;dowpr;hIfVve$K?fDZKs})A@Gt?N<MSxz`Q25p
zOo&<wac_w>bUv*nwu7EglmI;ox(@Fba5E?<%oki`yS@1-NT0(P_miYSuIU|UJ+I^$
z8pc@+bDXs3`2X_DI0`w^{yTmB4~Cbh^w87{{lw7|5xJKx)?5{1^aow!lvO^DMGUGd
zb3o=uzaUqNLt;U06|?mmU-(JOgQYlRLnTvQ80%~dI)PpwG^153Z<fAnPB?K(;GMt~
ztX5Im?+v{yf}BfPfLi`Gd^~z?_#e`ytmOOb4@Md^>kyXXL*|sM(+eJP7CS;Odc<bx
zl=FyBNyoO_d7OcC>hp**knVg!)){c<u-C^M)+z51XCR#lr#xf>bS&vA<rJjTQI9z1
z=+y5K=Nw(#GImj&j(L5YfpjOk^75R4bQ-kZ7<*MLO~eAPYhU|ry)|MdC%QB_dZN35
zcS&p2%`bkD-<-%Vo%}emdiS%<-*1Tm<nw=CzV!2i{rSmLnl#1>OOyLr`L7kHLpF%b
zVCF?+VX{TsUm3q5mZsjW?Sy1ro|&?=%!u5WIx8;AGt=*ip!{pv^0S2>3VY!tOUQCA
aur%{&l(ldmV29^6m;Lt2%&7Qe*7rAW#haf1

diff --git a/src/views/oms/emisWaybill/BatchOrderRecord.vue b/src/views/oms/emisWaybill/BatchOrderRecord.vue
index 400dbc5..135d9dd 100644
--- a/src/views/oms/emisWaybill/BatchOrderRecord.vue
+++ b/src/views/oms/emisWaybill/BatchOrderRecord.vue
@@ -502,6 +502,8 @@ export default {
                 // blMessage:  element['寄件/签收短信'],
                 realValue: element['货值'],
                 extInfo: element['附加信息'],
+                pickStartDate: element['预约发货时间'],
+
 
                 uploadStatus: 0,
                 errorInfo:'',
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index e91e978..31c260c 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -1199,8 +1199,15 @@ methods: {
   onSelectProduct(item){
     this.form.productType=item.productType;
     this.form.freight=item.estFee;
-
   },
+  handleReCalcFee(){
+    this.productFeeList.forEach(item=>{
+        if(item.productType==this.form.productType){
+          this.form.freight=item.estFee;
+        }
+    });
+  },
+
   onComplete(){
 
     if(this.action!='add'){
@@ -1259,7 +1266,6 @@ methods: {
     this.preCalcFee();
   },
   onTransLineChange(item){
-      console.log("==xxx==>",item);
      this.transType=item.transType;
     this.preCalcFee()
   },
@@ -1660,8 +1666,10 @@ methods: {
                   this.productFeeList = response.data;
                   if(!this.productFeeList || this.productFeeList.length==0){
                     this.$message.error(`无报价`);
+                  }else{
+                    // 费用发生变更后重新赋值总运费
+                    this.handleReCalcFee();
                   }
-              // loadingInstance.close();
           });
         }
     },