From 37df37da4ab93c1126b093806740fd223349f21b Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 17 Jun 2025 17:23:03 +0800 Subject: [PATCH] md --- public/static/tpl/import_supplier_fee_tpl.xls | Bin 24064 -> 25088 bytes src/api/emis/emisSupplier.js | 8 ++ src/api/emis/emisTmsSiteBatch.js | 12 +++ .../emis/emisSupplier/emisSupplierForm.vue | 6 +- .../emisTmsCostFee/BatchImportCostFee.vue | 87 +++++++++--------- 5 files changed, 69 insertions(+), 44 deletions(-) diff --git a/public/static/tpl/import_supplier_fee_tpl.xls b/public/static/tpl/import_supplier_fee_tpl.xls index 34b6c6ef148db9fd61aaeb80550e93362294c1ad..9df23b0d9f939a8ded26d6c5f844fa099c32b5fc 100644 GIT binary patch delta 5725 zcmc(jYitzP701tvXLr4Rzc9vNdu=fB13$oku`%`cgr+r1ncuTa_Y3ileG&6jcQw)bs&t|7T|Q?hFN0 zQE79>cXoc~oO{o`cki5gyt6-6X5Uu=w|s` z!M!5NX+*2=%(BOkNQA{zs5gSw6cOoh3C+DCQ6puPrf8IokO;b4#fUp!Ty|%~K`ySj zOA}um&MMi!Ex~_qUlPCeWQil5k?<#;eTsKAWzmOF)r2>CzY~|0ucgy<3`eP^N~*>+ zOuq1)q(_SQOG=L76?apr6j!()^=4dh4iWzRKEIFDd2uJBpma6HnL+3i4u|PxD4U9#gIpJyntW3^^tiwRd~% z9sQeJPWXudQFOwF+-0uYjm%7UfPVkm+NAI=Guay!aROfwutM6K0{hu zRLGy{FJeViO2*3aUc#0TM{|8ji}<*3tI`^^R@#iGmZCJJUGx@}SL}qXLYmd;{{8#L zUV@Nbj;}!Fr)cSry>#L!Km2yl=Q$-+jjVPnA=*#lxK3a;=P8Yjcd%Sj9uAHNA6!V8 z5Vtq3+Hi5LN)JhMpMZ)hw&JZz;!;oO^N@>_w>rPQr==&k``(O7%F2rclaRgi(ydE% z7sIO?-qdtRJ^i0fC6Q7?8>kL%!x}i_T8kaI7FPl(y`ifeZ=EkYd*E2}Vee$%jj7<@ zLLO4qz+w%pLmU2_A}?>VO8V}ZV`pbB-yA;FmjH1koeci2qwZqKS7$EY4S8Qrpc=?9 zx{h-v5B2G920xuj9j%8KpK-Bbao4$%JmQOCGaWr}vdIi^?b7QPRBNAd9hw$`^~;GL`E{}zti#J=U*h$61?~2Aw9#ST zfZaFZiaFdwn`mB(aU-?Z?R9F!Wp~gT=kJ zsM}_*Cs7aWav1bdugxHd`f%Bow4eGNOFBRU4*NkGbPRZic02mtLwjO-LdPpJjLW{{ zBQ)aZa1>{`FEciyG1}|U@1uPVhvPKi=x>rH9RuEvkRAOBb$;&;;Ic3AL8K0ZCFDTO z`e|I>@WkT4Q9e7oTMa#_c*jv(#vK}pSCOTl9Hm(!yO~#-4Vhw-`IS^drs_`-#yv%* zJt2F9u*QW?KO&P95IZqR1+jmV;;`+wUz0T2hN&^>+>Hy!<2RLV5GPD>Et8Z7 zLa4PY^FjHN3P1%>(h*>{qee{&L4}fvKt+<4gO*EL0Yb2~Toi*4YAsp`S}ExT&CTTlpyQCeU9g^BXI9;qh`DD>K5jGum06Qdgf^g7Sx&SC3 zDF_Nm>H^`2u`ENNkfd%|EBu`zynfw5MRVWNrym(Bu#;)Bpn7FmUIMkMA9_Az-fyVe7539G6%zn zZYzBSq_cYk2SqC#1O5a7Rlz~Qo9kW^-^s7hPw_9Yf)k?c`Ct0;@A3=vsJCI})0p8W z#$n0HSnC(+;J;jx|L^>xQ;oy-YEBjN|5C62-Tb3-syXVj=>&=1@q5GqZHGj=z>*?3aLbYNo^XGdn?*ieid?>C+JuQ;FtL}KvW zZJhUV$=;BPwpc`!Q#A9ZH}f9Na}{cUTLcQ^v}Q2FGaZNIHuA_K@x$PxxEksfBfGB{ zbv{%vw=3K8b@f~Kc6J5AdAk%<=M;}-h20Kr9eS#vc>i=kF-SbNgK5 z_dXJH{bd=P#A@sY<#B|6V-g?q*Ut@Q)pI^wjmoRV2@cAvA2-t%8TmE~*^W!Jr-vju zhO!s289V2<|2;HKf?Je-0pQe> A5dZ)H delta 4995 zcmc(jYitx%6vxlZZnv*(x4X2Zlt-rp3Vq?WrMxNI(gH2C-9BL3TA)BnsT4Gk7!Y(e z2EX}AuO?^$YGUFCF+z$aMuWwuAN=CugOBKkl3+A`&<|=b23Y@RW_ovSLB&L5CU<9k z=bX9sp1XI>IlJ)>wD`MP^wUp*Q!k${yi7BWdh*bXL^}Cgat-&~tRsi03^&X-5{ZN@ zBs$;uhUQCLhon-Z489m-T?Ld?j@^y(om;i>fw8P-O1~KHc4HV{#Wr!MyaUIEYQ*?S~EZNh$Vqs zlN|~Xg@eI}5iv-gG^Qxm>e!M$;K+TomOKR-OMcXmliMC+7-~Pfn76XG<%LAuGdjBI z0bjZ`@U7%0(sJoUnl)GFqlMl~9er%#bdE1uOwP&C8pY9~CXrWEEV7LpZL=scDpI!a zl*DJbc@rNQR|}fHUBl1%v~D^;!#IynH9d|Mc(!$>yvC9n+h)pZNqo1ua#`JvI=;L2 zy!S)T%|qI;y~PKwcI%{-K3Oz^OKRT_V_wo8e)!X;CtB7#@AW4r1GckP5cx?Qik6Cw zNSbc6iqp|{@oMC(Ih7V5oxJo2^!VnBN#5dm#}+MlX^d%p^PMFQMRHFP=MV1 z=THt!x$J`!#O82y7@|DIAfIL{`T{CYI-Emu6n!BTD$mcQ`HFr4El~7DWELp~1{sP$ zF%>HVmQV>z`I8byI>J*Px&?@DD)wEWzUq|a`(6wjQ(|Vfp zCMQr&n-u%awAtOiNm~fp-L(R3)aEvzcIr^{QHm-P>ZDG3DLpx07j-H2-PEJlZ>JqD zz3HbIPWP_trCw!8`>0P@(the!?C+&}l?e~fPS*f_+J)1-Cw9~Bq~63UG>FqZfjzW` zj9E#K_R>B@KSV>yfWx#u*&+HH!Rg)u2M~AM{g2Y9eBLA-?<@`uyLMDb(-CB?`#5J0 zn$#l1GR{i(lP!yA0ZYaPGi9Dz$hY(+u0jvZPDS|@2eXuYI*P`#uLpbZw8yyGLlh*UO! z8YDG>8YOK6ZIsjmYLe6pYL>JKgvjqqjidf%Nn3EwH4>cQ{oev;k;+z3tE8=eeo+53nMfYZXw%&cfCeP(1Rl&9 zvD|wl?E~$TWDWs`Bo2dyCG7_xwKxNgfJP)803DDt3L2GkANJ3Ek`96nN*V)=NjhW# z4@o=>It;oVn#swKO z4=N)4xf=c>c}*MFy~5iQN^RG(F8qGHWnzAhrf=bd!pF8VTqyGOd+T~F!Pm(IIr3@# ztE)J(!w6mt`0+lc(%L_=5Ec+Bg`z`rU#_vMLsF{71pAC5SuBwi-Y6lrKD z(Aa?|(AbGnXd$#$(54R#7U%E~mx|sr@ldS1gkP(lo-5-FLlOS?{L=OJPkyag_r)LK zA0hE^teg`)mIPBG;p<&9zUzpO>(nPS%&^surIH5(NB&U|7Lnduu0-Ntd~l`AB?~Wi z1Wlc#t%umM<179id8#*`OWHU)&E_Z3*pqYO?cR=R+dZ-hOUB3kLun4 diff --git a/src/api/emis/emisSupplier.js b/src/api/emis/emisSupplier.js index 09eac48c..324db1d7 100644 --- a/src/api/emis/emisSupplier.js +++ b/src/api/emis/emisSupplier.js @@ -26,6 +26,14 @@ export function getEmisSupplier(id) { }) } +export function getSupplierByName(name) { + return request({ + url: '/emis/emisSupplier/getSupplierByName', + method: 'get', + params: {name:name} + }); +} + export async function getEmisSupplierByCode(code) { let res= await request({ url: '/emis/emisSupplier/list', diff --git a/src/api/emis/emisTmsSiteBatch.js b/src/api/emis/emisTmsSiteBatch.js index d2811948..2e242b8c 100644 --- a/src/api/emis/emisTmsSiteBatch.js +++ b/src/api/emis/emisTmsSiteBatch.js @@ -17,6 +17,18 @@ export function getEmisTmsSiteBatch(id) { }) } +// 根据供应商编码和运输号获取批次信息 +export function getInfoBySupplerAndCarNo(supplierCode,carNo) { + return request({ + url: '/emis/emisTmsSiteBatch/getInfoBySupplerAndCarNo', + method: 'get', + params: { + supplierCode:supplierCode, + carNo:carNo + } + }) +} + // 新增一级网点TMS组批次 export function addEmisTmsSiteBatch(data) { return request({ diff --git a/src/views/emis/emisSupplier/emisSupplierForm.vue b/src/views/emis/emisSupplier/emisSupplierForm.vue index bf150090..7bf7dc61 100644 --- a/src/views/emis/emisSupplier/emisSupplierForm.vue +++ b/src/views/emis/emisSupplier/emisSupplierForm.vue @@ -41,7 +41,7 @@ - + ",key,indexPos); - if(indexPos !== -1 ){ - let feeTypeStr=key.substring(0,indexPos)+"费"; - // console.log("===feeTypeStr=>",feeTypeStr) + let feeTypeStr=key.substring(0,indexPos); + console.log("===feeTypeStr=>",feeTypeStr) if(!(feeTypeStr in that.feeItemMap) ){ orderData.uploadStatus=-1; errorInfo=errorInfo+''+key+','; @@ -389,8 +387,6 @@ export default { this.$set(orderData,"feeItemList",feeItemList) ; } - - // console.log("===orderData=>",orderData) this.tmpDataList.push(orderData); @@ -449,7 +445,7 @@ export default { feeItemList:[], }; - submitOrderForm.batchNo=orderItem['批次号']; + // submitOrderForm.batchNo=orderItem['批次号']; submitOrderForm.billMonth=orderItem['账期']; submitOrderForm.remark=orderItem['备注']; submitOrderForm.splitType="1"; @@ -457,22 +453,31 @@ export default { // this.$set(submitOrderForm,'batchNo',orderItem['批次号']); try{ - let batchNo=orderItem['批次号']; + + let supplierCode=null; + // 通过供应商名称找到供应商编号，必须完全匹配 + let resSuppler= await getSupplierByName(orderItem['供应商名称']); + if(resBatch&&resBatch.code==200){ + let supplier = resSuppler.data; + supplierCode=supplier.code; + }else{ + orderItem.uploadStatus=-1; + orderItem.errorInfo='供应商不存在'; + continue; + } + + let batchNo=null; // 获取批次信息 let qParam = { pageNum:1, pageSize:1, - batchNo:batchNo, + supplierCode:supplierCode, + carNo:orderItem['运输单号'] }; - let resBatch=await listEmisTmsSiteBatch(qParam); + let resBatch=await getInfoBySupplerAndCarNo(qParam); if(resBatch&&resBatch.code==200){ - if(resBatch.rows.length!=1){ - orderItem.uploadStatus=-1; - orderItem.errorInfo='批次号不存在'; - continue; - } - - let batchItem=resBatch.rows[0]; + let batchItem=resBatch.data; + batchNo=batchItem.batchNo; submitOrderForm.realTotalWeight=batchItem.transWeight; submitOrderForm.realPieceNumber=batchItem.packNum; submitOrderForm.transType=batchItem.transType; @@ -488,29 +493,28 @@ export default { submitOrderForm.pieceNumber=batchItem.pieceNumber; submitOrderForm.totalWeight=batchItem.totalWeight; submitOrderForm.totalVolume=batchItem.totalVolume; - // 获取供应商 - let spParams={ - pageNum: 1, - pageSize: 1, - code:batchItem.supplierCode - } - let respSp=await listSimpleEmisSupplier(spParams); - if(respSp&&respSp.code==200){ - if(respSp.rows.length==0){ - orderItem.uploadStatus=-1; - orderItem.errorInfo='批次对应供应商不存在'; - continue; - } - } - else{ - orderItem.uploadStatus=-1; - orderItem.errorInfo='获取供应商失败'; - continue; - } + // // 获取供应商 + // let spParams={ + // pageNum: 1, + // pageSize: 1, + // code:batchItem.supplierCode + // } + // let respSp=await listSimpleEmisSupplier(spParams); + // if(respSp&&respSp.code==200){ + // if(respSp.rows.length==0){ + // orderItem.uploadStatus=-1; + // orderItem.errorInfo='批次对应供应商不存在'; + // continue; + // } + // } + // else{ + // orderItem.uploadStatus=-1; + // orderItem.errorInfo='获取供应商失败'; + // continue; + // } // 费用类型 this.$set(submitOrderForm,"feeItemList",orderItem.feeItemList) ; - // 获取批次关联运单号 let billRelList=[]; let resBill=await listEmisTmsSiteBatchDtl({batchNo: batchNo}); @@ -529,7 +533,7 @@ export default { }else{ orderItem.uploadStatus=-1; - orderItem.errorInfo='批次号不存在'; + orderItem.errorInfo='批次不存在'; continue; } @@ -567,7 +571,6 @@ export default { this.orderList = this.orderList.concat(this.tmpDataList); this.tmpDataList=[]; - this.openUploadForm = false; },