From d1f206894f9b7462743ac00ac4024df554e9122f Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 18 Jun 2025 18:21:43 +0800 Subject: [PATCH] md --- public/static/tpl/import_supplier_fee_tpl.xls | Bin 25088 -> 25600 bytes .../PayBackStat/SalePayBackRateDtlList.vue | 133 ------------------ .../emisTmsCostFee/BatchImportCostFee.vue | 59 +++++--- 3 files changed, 40 insertions(+), 152 deletions(-) diff --git a/public/static/tpl/import_supplier_fee_tpl.xls b/public/static/tpl/import_supplier_fee_tpl.xls index 9df23b0d9f939a8ded26d6c5f844fa099c32b5fc..448f8568daae406cd30ba332e8084c1cfd10833a 100644 GIT binary patch delta 3933 zcmaLadrVu`9S88=H8wUF111D8A#i!*1q3@!9(mXyp#+G*Hm{ICVxDOrNkg(A(Ph2a z)@jnRv{TQtWZK#!(xgh!x~+Bp?GkBQRi&!bN>$tRkCv*cROOGfe{8K(DRsZ+-s_+5 zRnf2v_j7)~d(OS*`2LQ$@^9tJTgvZ3Y73b^#Y9_isNns5I-QoSA-rFW|6NI?mD`Fq zpVN@~YtHM6P;)#Y<|@YDid52d+a&_t3NeZIHg8BQdu!eQC5osKRowOlwF;tp>I#)o z5jy){8l${Vh(*eN)NY=YX-B4!|9ijxy7#)5oI$-Gzoq?d&D|Pu=IQMvmUbgwwojMR z8V=0O87H*rCzNK|-=`!ls4_F~+HCt|L=Eu`;EIh4dfm7^ayIJyl#7oGx44`1aZ;D6_(hHu_eJ8aEaYzxlt>hpR@*%$|D-SL?aijNU2iRs!Nq;X2_fdK_~YE8?Ml zV7W1Gm;HXZUYQ9n+A$xiwp;RZjhXj|&f?+RIQ{K|=9{S(i+^6^@5KZtm2 z2&!8|vs&%yml5$^=~^+PmWY?t8gah5M2U&o>gv>+>bDh+n_+Rcz0A=X6Cbum++XG{ z;e;ho-O=WAk@ED@?>^stO*!$-a%!aG1E(*Cl!MeyWArxV<%v-E6-~w#j{Y(J<(Z<% z%5*-d`b)N!C!SsM4Sl`*pOZhm5uEEld;7J`mzHldk&LPoo%(9*zLB(QEn?=F<|r(neH3 z;%scA7>Ib3e~CZG2E@yehnkZHJqIz@PWl-VTzJ*_vd+aykUQ%_DkRF!x`^k^3 z(~70P5`0EhEct8XBW1}iEv9l?LWNK}OPeh{ti!EXy}S$kYBlAZOMHKUH|Y#H@b zZ@Z=jYM_;Z>^*FtjkXas(I%pzY+idyU zX}c}HgLaVW7sCf@G|SZOrrox)TB+4`TW!=~yX`%+&z8TR_EXZ8y{#~X>7Fy|2pzWN z_fQXM*0t=#<6@oX0UEGfK#bzHc!CnP3mU`|a4Ro6;1CVj@`q`}mOn~IHCw_Mo>uG9 zAERToc{@(WF>l!c#%bJ^KS2|=3qC<7ZT%-HX><1+b(#X=56OMglNIm!5KPFgefHRab2WE`n9{0AKwe&N>^aw0^%Nr z+ysd(&=pxn>7H^xZ&NI75v53PlL?u;Ok2(>ZBE%HzUdm%dQm1&j2*f7or}-OW7Htr z8IEL&ArItcfa-c z%@NG~ls~y5VX~sIBcGe!K!xYBf z3-00IK4>p%KZM$Ab`ys7vm#KKbpVR6I-vusgHR{y5G0>_eJ(WW0uNk4`Zz3&@t9HbeuH-jk8Wb6ReZa309J{ zKDl$4*EWe@k~IZQvZkRa)(qxsnl%f}u;!py)+uO?^(1tPb(*4@+(*pe=Mg;3T7c$R zXRr_pth3M=);Z`b>nZ3Q>pb)nYY_{GZATwZ!QXD`TVyJr+;8OPQo%mdO&6gzP+k?v z(LZWmhvf&3B2F{Mh1Q>-;h*#ga&kp1`oO&iJtT(+^?&9)jCeQpHMEG9{?C0DlT&5{ zGA$pX`2PW=C`N6$A>|Q062-Alp&NUn{1?KFm(wZwV^PQTcjfWf}me~8kP?`HVN7v!xr}5PKp+$#yX2c_&8<~G$^j4z>=gnYF&S4=g(>Jph zFUxcBlkimb{OW-1J(h)0 TmP2_g-?HGzzmH#yhm{`y2?LZe delta 3547 zcmaLaT})GF7zgm@ltO_5EeKdZ-~fX1B?VNlf)r3I0<{$RR=&T)5B%DN$+l{ixnx&{ z*UVeoZZ?-?G4)!_;*w=onPy23UHkI>xpXa>qc~5(u z2d;jmU45k8aO<^X{&N!5;84T+<;KQ_9IeCqZr{gRctg9b32#DL_))?=E&P7s?Znh% z#GY^9q~FATdxf}ScZ(^zOMGB2v8|Er)x9q9rM)hcOY~4*r)799zBYCU%OqY=%E~fi7 zi5fS+B_988v>{`&b92p^S2m5-m{E_TK%_fr#Gh$d;ckab6CP)}mM`4S(&QxLcG|?d z&Vi%=eY4h-7JlKp=Fob?hkCWRqh|I zGf^6e`e224(4K7B=oM2zzu4OGG-M~Tb&`dw^cphci&A4wmtV5DxPu(Do*auiaWU(0 z`I&?-Q(S%)zUV9q#a~k?mC|}z z>>A5xyD~#Ll@mE)@e10h#4D+iR^#?qMO8|?nyN{Ui`P(1zp`Mhe9GfC=_a=lug9mT zXT~m|ff|(jMryYWm*^Z3?jV^@M=`C9aKc44>)0cPhJQ9*EvYHc}r>hqE^P$!r z8I!#xI_A|JkujO@@3DkU#;kHoT=$KHx+oFHFHkyAeW(lXsBDmpl?=(QWn`v6DXdgT zo^QnL5K4`yGzf*pR63N-%Al@Lq_r6*IuMi%&5#q48#j~*$>wD!3z99%&=yGcDMQ&% zHY*2`J;{jWLb4MX+6ska12X6WWwSAq2j#KyA@n{oRsa>Swn5uig%HY^nOOuCv5KK$ zmQF`W4>3!?5>_cx$|{4(Slc1gIdh3}2vyEh1ysS>0qtPzgi!y?%u1+|u)eY1DiFob zR5f*@^hH&JnEdU=$gG9r?>&ZgVNbhQb*L<;h-S zYKLSaHZnV)4pt{5A9o{m5IQIoiaa=nz(X87455IVsXoZZlBN3ys|$s@i**z_%Ib!? zSv?SnzB#8X_`MN@{2V+6q5PYv0Vu%ggZfxO2!-Fw?1%bU$D!k_0ce0V2%#a! z^W^t`2prssdfKISZLTCx*rHw;q2&N{W2~${q5}f4V6g0(} z#!Z`M%|J7(S!k9u2hFkOAv6ec!3Ai6wFoUn6+&O=!8@9|gb!kgbs9R&Is=_yorTV_ z&OzuX=7P)k0GCb4HsM24Fk%}1MDfuDR-y&GD4zA^+3wSK2qp^M|0Hpl?$a;gZ~spz zK1_sTN)RvoKeDV+IWqPH1$-J`q5$bhy7rWwinTs>Mgsbn{A(xyFN;Nd-(N18f;%l= z9Sctdi?o~;`K=?_w2a3A$8;%tv)^r58O*g^x4iwVHy8*P4qmW`cZQe5YDeRiSy7o!< d%EXR@Lixv871CsJlgIKc%a{E5;%;B3_7A)~KKlRw diff --git a/src/views/emis/emisSettleBill/PayBackStat/SalePayBackRateDtlList.vue b/src/views/emis/emisSettleBill/PayBackStat/SalePayBackRateDtlList.vue index 8fa3269b..46b20173 100644 --- a/src/views/emis/emisSettleBill/PayBackStat/SalePayBackRateDtlList.vue +++ b/src/views/emis/emisSettleBill/PayBackStat/SalePayBackRateDtlList.vue @@ -1,138 +1,5 @@ diff --git a/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue b/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue index 9e4a0313..a4b0dcdb 100644 --- a/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue +++ b/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue @@ -171,6 +171,7 @@ export default { selectionIndexList: [], feeItemMap:new Map(), + feeItemCurrencyMap:new Map(), // 动态费用列表 dynamicCol:[], @@ -264,7 +265,6 @@ export default { // const header = this.getHeaderRow(worksheet) // 标题 const results = XLSX.utils.sheet_to_json(worksheet) - // console.log(results); // 标题头 that.dynamicCol=[]; @@ -283,8 +283,6 @@ export default { let item=that.dict.type.emis_cost_fee_type[i]; that.feeItemMap[""+item.label+""]=item.value; } - // console.log("===>feeItemMap=>",that.feeItemMap); - // console.log("===>dynamicCol=>",that.dynamicCol); that.batchImportData(results); @@ -330,25 +328,25 @@ export default { errorInfo:'', } - // console.log("===kkkk=>item=>",item) let feeItemList=[]; let feeItemPrice=new Map(); + let feeItemCurrencyMap=new Map(); let errorInfo=''; let batchNo=null; // 费用处理 for (const key in element) { if (element.hasOwnProperty(key)) { - // console.log(`${key}: ${element[key]}`); this.$set(orderData,key,element[key]) ; // 解析费用数据 if(key!='运输单号'&&key!='供应商名称'&&key!='账期'&&key!='备注'){ // 获取费用编码 - // 单价特殊处理 + // 单价和币种特殊处理 let indexPos=key.indexOf("单价"); + let indexPosCurrency = key.indexOf("币种"); + if(indexPos !== -1 ){ let feeTypeStr=key.substring(0,indexPos); - console.log("===feeTypeStr=>",feeTypeStr) if(!(feeTypeStr in that.feeItemMap) ){ orderData.uploadStatus=-1; errorInfo=errorInfo+''+key+','; @@ -359,6 +357,17 @@ export default { } } + else if(indexPosCurrency !== -1 ){ + let feeTypeStr=key.substring(0,indexPosCurrency); + if(!(feeTypeStr in that.feeItemMap) ){ + orderData.uploadStatus=-1; + errorInfo=errorInfo+''+key+','; + continue + }else{ + let feeTypeCode=that.feeItemMap[feeTypeStr] + feeItemCurrencyMap[feeTypeCode]=element[key]; + } + } else{ if(!(key in that.feeItemMap) ){ orderData.uploadStatus=-1; @@ -382,13 +391,32 @@ export default { orderData.errorInfo="费用类型:["+errorInfo+"]未配置"; } else{ - console.log("===feeItemPrice=>",feeItemPrice) - // 循环处理费用单价 + let costFee=Number(0); + let usdCostFee=Number(0); + + // 循环处理费用单价和币种 for(let i=0;i",orderData) this.tmpDataList.push(orderData); } @@ -505,12 +531,8 @@ export default { try{ let batchNo=null; - - console.log("===>orderItem===>",orderItem); - // 获取批次信息 let batchItem=orderItem['batchItem']; - console.log("===>batchItem===>",batchItem); if(batchItem!=null){ @@ -533,6 +555,9 @@ export default { submitOrderForm.totalWeight=batchItem.totalWeight; submitOrderForm.totalVolume=batchItem.totalVolume; + this.$set(submitOrderForm,"costFee",orderItem.costFee) ; + this.$set(submitOrderForm,"usdCostFee",orderItem.usdCostFee) ; + // 费用类型 this.$set(submitOrderForm,"feeItemList",orderItem.feeItemList) ; // 获取批次关联运单号 @@ -549,9 +574,6 @@ export default { } } this.$set(submitOrderForm,"billRelList",billRelList) - - console.log("===>submitOrderForm===>",submitOrderForm); - let res=await draftSubmitTmsCostFee(submitOrderForm) let rstData=res.data; if(rstData.result=='success'){ @@ -571,7 +593,6 @@ export default { } }catch(e){ - console.log("===>e===>",e,e.message); orderItem.uploadStatus=-1; orderItem.errorInfo=''+e.message; continue;