From 7f9986cf872ac08956251794adad896db38e8dbd Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 21 Nov 2025 17:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E5=8D=95=E9=94=80=E5=94=AE=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/tpl/batch_import_order.xls | Bin 40448 -> 36864 bytes src/api/emis/emisSalesCommissionRatio.js | 9 ++ .../emis/EmisBaseTools/SalesSupportPicker.vue | 111 ++++++++++++++++++ .../emis/emisWaybill/batchWaybillRecord.vue | 2 + .../emis/emisWaybill/centerWaybillList.vue | 9 +- .../emis/emisWaybill/dispatchWaybillList.vue | 10 +- .../emis/emisWaybill/sendWaybillList.vue | 8 +- .../emis/emisWaybill/sendWaybillListNew.vue | 8 +- .../emisWaybill/waybillDetailReadOnly.vue | 1 + src/views/emis/emisWaybill/waybillGot.vue | 30 ++++- src/views/emis/emisWaybill/waybillModify.vue | 30 ++++- src/views/emis/emisWaybill/waybillRecord.vue | 37 ++++-- .../emisWaybillAjustApply/adjustPanel.vue | 17 +++ 13 files changed, 245 insertions(+), 27 deletions(-) create mode 100644 src/views/emis/EmisBaseTools/SalesSupportPicker.vue diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls index dab07786f87f7de7f93c69fdda5846d3d8a2af02..84b7fe4cae769fb2eff50f35fa7b9f86c27095bb 100644 GIT binary patch delta 3266 zcmbtXeNa@_6+id!c3EJ7UDzV9s0$*n$dYAQ7N}U4uN4fRg5p;zQK&GaB42ey%#tY3 zQkx*RCh9b)(`w_Glo~gaNmD05+swq6%xIfQGnUCXiA^${Hj}39q_NiR@4npy*{uDi z@6CDV{?57go^#JV_w3!#i_+*R>AWn(+KH$dB!h~$Uix+VU7ydl8pr`E29mqXrZ(6aJ?#1 zt%6|xc79uK&}aiX$aA<`)yiUcy1XQ=>HKPC7XNJgbJe)4*c*|`{EdrhlPrAWH`U30 z$sI^)gv1m%;+LF?%<(tgicC%(hDuB^0)7zmNC129L~0_;M2zS(e7*&7iRAb9Ibff% z4n<8Zxt-bE;?B|+|Le7_L)UlLo_*xd5&ClYVhV4T6ZyUvo$kzx`HycM_^|$b&Yx5M zRGi}E6YlN{S{w5`Cb1uEYiTSX1I@vN&oc#sMC1R5{4@CM^IU|pi|2U}ICOqb(6ENW z8;%Mi?_v!5|5XEd_mRu@kEi$k|sSqz~JlktU3zFidtu?pYin zp@<4QK%ymK4G=}&M{d85yzE}NXMXP)tqp6K=o|MAnC~wKBD6RXV(-JP_%lQ_+!kkv z0nuR$FHRQk@8h43w%&xvR7}Jufyk{-aGIPZQX5Sp8Uu}JpqPI)(bCP=e(QZI^`peZ zgPJlrxJbK^v$Pa%cmBBq!=R`gq^6dx&d$MtG1Afc&ED*CJ&TN1ZGmQ!cWp(3%zsiH z#h-K~A*K0@YYRVBtS!^bMQ&u|o`;5*ixQ9oRX#kTV3nrA%kqd;xPTY%DM zqkM1&@;6^;+wt8_4^ll@ATNNt3MR`@EJeE#(n=ELk;$7S++APbCe}01Z+veMiB{hhMFINL|ykp_O#rOSNAxeyz69+yRv!F@vDsBib4t41vTW z1&5sG?X_BOP0M!4vyx14RfH9z@@Xjx@6E&ooJ~1I@e9~YX1b|ez`2x5&V&WLidKwuthisES{%fm3dce+Q!TlTI%xt%1g-_gcDZC6L; zDL5ho%R#JC^gMpY7STI^`ur#`HZs^ZfHfgFDg;M|;Fu7s4Z*QN9I*cAPQ{miwfLYm zfOR2QAH*^Km5Qxg&-ES6+|(f#ZlD&#UPwT@ohN2P2Lx~%2d;PI*fbo`fm|ab!GnB z1bhlS{BMU-_>`Q(XZL7OWc)w)%H>2p(V`KDCFoSl0Khx`Bggw5EA_fZQ|0LHw^#S1AZilvslhV--eH5(lFL6m zY|=NP$nB&;&@OC?gG%}GvGlmkY|J7aQ9V?=VQfiGQ)ow+Tq$X>!(G&gcMz4(=d%v* zAC9fiH-~oSm&U#(^&9znV~sp}B9HsV)A+>1!!NWavu_sMa3@!Pais3-C)TBj?;382 zrHBPYzHEE$M=!luaqb^Qcb9#<`<0-4%Zb;Gzx%eme)8Y0_dl4bI~9}*ZpFA!5YZB5 zpa|CLZTg;xanJWJajP6JA+ahZYgI}(yi=3Ktf?iJ9eTO7t9ziWx1V};_V)Iyqh!@+ zV(aKkH)?cS`RGfK)6QAe`-@qYdikL%F}52qX|oAu@oQ7T3NG(g%|4N|tU_X{yvymh zDJC7sPqm&Kc*kga+i1HYzNc;Up|Rh1#i*+&<=5qOK6`8|v(!~mTx@q0Sqcm6l@@!2 zz0gu#YA>?5T%}f9No9r0TI%B6PtMc=*{qHdN3p%6{9ek4jjn2{Sd-zfI&2tNTw3HO z$k$b_$*3%^EGew6a+H@=6$>hI@Q$bE5CoY!k6Sk!M}#6l{(SWR6{rCgXF^n9agN(T z;#jyrv7p1CM9>sS^R@lOEMLa2Gm1$Q}JU{(5cR^pqh=T-Ya|xcfr$FWJ#{J9nO#z3^iv F`!D?d9>f3u delta 6874 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 + + + + + diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue index a9249585..24d9d05b 100644 --- a/src/views/emis/emisWaybill/batchWaybillRecord.vue +++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue @@ -76,6 +76,7 @@ + @@ -510,6 +511,7 @@ export default { feeRemark:element['费用备注'], payee: element['回款联系人'], salesmen: element['销售联系人'], + salesSupport: element['销售支持'], operateEmployeeCode: element['取件员/操作员'], remark: element['录单备注'], blMessage: element['寄件/签收短信'], diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index 0cd5cc31..0611faf1 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -290,8 +290,10 @@ - - + + + + @@ -478,6 +480,7 @@ + - + +