From 29d79b76f170ba8f6688a947e0441884451c6713 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 24 Jun 2024 13:29:39 +0800
Subject: [PATCH] md

---
 public/static/tpl/batch_import_order.xls      | Bin 24576 -> 26112 bytes
 src/components/XdTable/index.vue              |  37 ++++++++++--------
 src/views/emis/emisUser/editForm.vue          |  20 ++++++----
 .../emis/emisWaybill/batchWaybillRecord.vue   |  17 +++++---
 .../emis/emisWaybill/centerWaybillList.vue    |   3 ++
 .../emis/emisWaybill/dispatchWaybillList.vue  |   1 +
 src/views/emis/emisWaybill/waybillModify.vue  |   8 ++--
 src/views/emis/emisWaybill/waybillRecord.vue  |   8 ++--
 8 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls
index 10e3f1ea1abf89d2305604d56658fbaa40566e6f..e683c12f57baa0f55c208cf9753dd8e282c5b1d7 100644
GIT binary patch
delta 2791
zcmcImYiv|S6h5<iyWQRH?!DVCw9wjjd6Y-1XhBLJ%d1-#?(ViF0g6D7wM~qP5!7HK
zTLVgrDXEN-Xw)Bs7=NL#iHX6qXbisqC1~M?KWbtKi5NH0@PjDpckaEtl-tIjN$+GH
z-<fk}=FH4J-wa<6!<WQpb9ED0pGLG2O@VwbpU<=OQRK6!&qOvaMndujEh3X@NS@Tz
z%3E4QiM=|0^IZ6s#)Y1CR`!Tq8l*JRK^VS48f{O?d#&x6UuhkwM7hUVi#)k9l+9iu
z7i!KtBj;x1Ix5NqP`@ssMBWRc6XhA9Ku;*8<TdorO=VP0H83ken{Dw0Te&QzN~FIi
z>fQp>jVxp9E~|wkCVKDa+xwd6^8Q^3S<$vvIn}><pB!#m7)Ix}{de>xIy}^p{_T~Y
z6Y_($n+p^Y@#lYho3-2|^nu=I^*05HMSb$E_7^h+B%0DU^e@xuo`rd=&O31JFskOB
z8#)ZRVhOaC5BZ>Fb-$dN&>`ccu;p5Uu3x|P9t+SsnEq+t`)3x9<jIevpI=MFd*Mg+
zd2u`*jm`%z7k)h~NbX5!az%&NRjJEEiDdRz$1M?w&}3jEwo0MbU^owHOIRL=o@tvb
zxi7B69+P?>*HiriW(~ZdzKxhup^tdqv$6I4Vrc{IHTPMl<aKEjhJsU8%(CpI4Zn-b
zW~v4F+gN)YZRI&FR8I-aNHj)YVZa7T&PB@1#i0LT%*>p4_3#VW_wcI!S5qGEDisa#
zldh_+Mb_a8T$vaxHV)U1TT}oPBad<Lf(p@IVrzPVmfFY%)F=b7^2{<@7JzKIJysAX
zMj>k~73~$arUt~Ji?5r&&5RKTH4_yBabPh~2@nT06Gea?v(Y@DRTVaz56BVAR4oO1
zLVgols<zm&3dmN=yRq`EYiwB+WKY_t8VEnJHAc+?s1}GL)|j#AI-nH(i!n;dWOuyi
zDe5s1x#eiQdm2_8xWIuu4qWKKUdBFqe0e+`pN1ym)8{U7*ajRp=)fTdRvlP#;4tH9
zv%jFn(_5$)o?oX%I*s5rC@#9Mh(7xFbem3tVO+Tnv7Z`wb08OkS(+4tI&$ZZ0;{Ct
z`1&EZ<uoZeOENC<8=APaxT>ZGlg5dFDQ9aAV5`7M9NIFZ2t|y8g}gNGHhD)gdITuP
z{HjoyaWb4^$<wqMVYrwgxRRpA)G^Dz8VIMp{V?J%uc0on<lqBL;=*LQq1NsyrY}68
zKDjcrC__eoHK(ereV^U+ofF0Ei}iuSK}@({ViO$^0b^OLKb3i@r6F-mm%Cfii$~z9
zMMOkXJj5fhdOlwcz8w?W?18pUjlwnmZKd<Y=LfF71G)z7fy+UFW@+O4EJ(y82n%au
zrfb=p=<pkiQb_b}Z}w2aFGN@#P437r*YM#8O7c`_nEZo{m?4Al3>jYqr>$=m8SlPR
z5049dhA=pbVrUi_UOY2wHF+huAhQlVW>g`HQk#YNs8r&Y6!+oefjTT?-p)=7vFj>L
z#T<58#W<!NyQ|WA3$ddrZLko#sM5wk3-Z%RrA-!Mw^UqKa~O6=rKwQIuBg;y_2D4`
z6hnC(ckmugrA&knnP((fnQ93I4OavOk=$<Cm}rp4QirmmyPgv#ddifmf3!xk6+K5>
zF1%@W^gSZS`o0VQseIaTdqQ+#is6&dq3Vm-kGD-IVwrqt=Mh&$U-s_KQ|_82=w$+F
VMCSJ@Qw383w>dXw&+gtJ{sAIu(Hj5&

delta 1616
zcmchYO-vI(6oB7smzLIr{zz>FDu`|Q6D^{MLVu7F%3lj@NDvOz1cZ|ZqBpfQ1ohI0
z&cS%$U`)JeaE(Ef>cOKXVhCIzF~o#}M-o8RH{E8N_0WsKnau9{-n=(&e%|aRzmVi7
zGV7^43E5%-s7H}t+m|GXX-{FBAAChbiKL3@b5oGE813|@sf3^McP_j(|EMc1@-jm$
ziNPd{W4!^5Fasut^wa%TpMDSCb3Qci(uKBfIt`GmE0$UM#2e?`sqGlu^_Eh%Z&QyQ
z;fdI_@IC7CPw6BufEPk^*Wbi_>=QkK7LK>Vx<GGTdRYy|AaKCLZ4lrD)^#DrPBwjg
z5aaRUM8_zpbwZr22h~O><V;{j@o$}l>BOzzFOukoDumw{9&qFcHh?swaR?{G4!$N1
zK1ALKiT|+1d=t2yuk#=JBp{qNlh|FE!zCz(z)6=w6-HO~zzL>Q2;5W(m337sx<b^|
zD5OWKMY_Woa0CO==H}6QmM#PiA=N3C0#ZG_+Fh1l*GslAp{_w8GZMRAa-Rk1v_glG
zJPMT{H7aC9I-}4Lq$Y)INN16jz>YJrBLUs*E*n3mSd^o#8A)D&gINTU0eKF`kj`VD
zyjK-Svc3|f7G;FvSxRSCU4=A&*CY*Ln(FD*4QAzyo?d-c2A)3b=~k#fMOsFRS7Tq!
zt59X9SCK*Gb+<p~C8+F*R8*|;S`O#DOe#CG%I<5Vw>65ZTEo*F696X3qUHmMLjLOG
zEbvwfV541w?&1P)uziIBtPTg=9&*v)Xr+NirAr53jZjZufPRlI5}u}Fm)qICvl4&{
z_>@lppdBt|iNm)MTC=3dP#Zqi@RRre-)&SJYR0In$Wbv7wuj~(58L@p+s?dLK0M9Q
z7b7;!9s&ApWX1eu<LTbkDhZ%NvT9{!?z1>Iy2_IpdNV%F-H(Vn@n;$<`zx^YXKBu4
O)*8g6u@3SmF8l$LW<3@F

diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index dcdf5afd..e19ff961 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="xd-table">
+  <div class="xd-table" :id="tableId">
 
     <div class="table-operate-btn-content" v-show="showOperateButton">
       <!-- toolbar -->
@@ -168,8 +168,6 @@
           <el-button size="mini" @click="openTbShowTplDlg = false">关 闭</el-button>
         </div>
     </el-dialog>
-
-
   </div>
 </template>
 <script>
@@ -256,10 +254,11 @@ export default {
 
 
                   // 增加图层
-                  var tbBody1=document.getElementsByClassName("el-table__body-wrapper")[0];
+                  var xdTableObj = document.getElementById(vnode.context.tableId);
+                  var tbBody1=xdTableObj.getElementsByClassName("el-table__body-wrapper")[0];
                   var selDiv = document.createElement("div");
                   selDiv.style.cssText = "position:absolute;width:0px;height:0px;font-size:0px;margin:0px;padding:0px;border:2px solid #409eff;background-color:#d9ecff;z-index:1000;filter:alpha(opacity:60);opacity:0.6;display:none;";
-                  selDiv.id = "selectDiv";
+                  selDiv.id = "selectDiv-"+vnode.context.tableId;
                   tbBody1.appendChild(selDiv);
 
                   // 表格对象
@@ -314,8 +313,9 @@ export default {
                       if(flag){
                          //重置选中css
                           for (var i = 0; i < fileNodes.length; i++) {
-                              if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
-                                  fileNodes[i].className = "el-table__cell";
+                            if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
+                                  // fileNodes[i].className = "el-table__cell";
+                                  fileNodes[i].classList.remove("seled");
                                   selList.push(fileNodes[i]);
                               }
                           }
@@ -360,8 +360,6 @@ export default {
                               if (sl > _l && st > _t && selList[i].offsetLeft < _l + _w && selList[i].offsetTop < _t + _h) {
                                   if (selList[i].className.indexOf("seled") == -1) {
                                       selList[i].className = selList[i].className + " seled";
-                                      // console.log("===>tst==i>",i);
-
                                       const cellInfo=getCellPosition(selList[i]);
                                       vnode.context.multipleSelection.push(cellInfo);
 
@@ -375,7 +373,9 @@ export default {
                                   }
                               } else {
                                   if (selList[i].className.indexOf("seled") != -1 ) {
-                                      selList[i].className = "el-table__cell";
+                                      // selList[i].className = "el-table__cell";
+                                      selList[i].classList.remove("seled");
+
                                   }
                               }
                           }
@@ -469,9 +469,10 @@ export default {
                   document.onmouseup = function () {
                       //把鼠标移动事初始化
                       document.onmousemove=null;
-                      var selDiv=document.getElementById("selectDiv");
+                      var xdTableObj = document.getElementById(vnode.context.tableId);
+                      var selDiv=document.getElementById("selectDiv-"+vnode.context.tableId);
                       if (selDiv) {
-                          document.getElementsByClassName("el-table__body-wrapper")[0].removeChild(selDiv);
+                        xdTableObj.getElementsByClassName("el-table__body-wrapper")[0].removeChild(selDiv);
                       }
                       selList = null, _x = null, _y = null, selDiv = null, startX = null, startY = null, evt = null;
                       vnode.context.mouseflag = false;
@@ -484,6 +485,7 @@ export default {
   },
   data() {
     return {
+      tableId:"XdTable"+Math.random().toString(36).substring(3,10),
       // 弹出层标题
       title: "显示/隐藏",
       // 是否显示弹出层
@@ -528,7 +530,6 @@ export default {
       currentCellInfo:null,
       currentSelectStr:null,
 
-
       // 表格个性化记忆配置
       isNeedDbSaveTpl:false,
       fullUrl:null,
@@ -571,6 +572,9 @@ export default {
     this.tableDom=this.getTableDom();
   },
   methods: {
+      getUUID() {
+        return Math.random().toString(36).substring(3,10);
+      },
       setTbShowTpl(){
         this.openTbShowTplDlg=true;
       },
@@ -978,10 +982,9 @@ export default {
 
 
 :deep .seled{
-  // background-color: #f3f3f3;
-  // background-color: #d0d0d0;
-  background-color: #dcdcdc!important;
-  // background-color: #f00202!important;
+  background-color: #d9ecff7d !important;
+  color: black;
+  font-weight: 600;
 }
 
 
diff --git a/src/views/emis/emisUser/editForm.vue b/src/views/emis/emisUser/editForm.vue
index aab1b7d6..324a6f6b 100644
--- a/src/views/emis/emisUser/editForm.vue
+++ b/src/views/emis/emisUser/editForm.vue
@@ -287,6 +287,12 @@ export default {
         ownerSiteCode: [
           { required: true, message: "所属网点不能为空", trigger: "blur" }
         ],
+        ownerSiteCode: [
+          { required: true, message: "部门不能为空", trigger: "blur" }
+        ],
+        ownerSiteCode: [
+          { required: true, message: "角色不能为空", trigger: "blur" }
+        ],
         password: [
           { required: true, message: "员工密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '员工密码长度必须介于 5 和 20 之间', trigger: 'blur' }
@@ -316,12 +322,12 @@ export default {
   },
   created() {
     this.initData();
-    // this.getConfigKey("sys.user.initPassword").then(response => {
-    //   if(this.userId == null) {
-    //     this.initPassword = response.msg;
-    //     this.form.password = this.initPassword;
-    //   }
-    // });
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      if(this.userId == null) {
+        this.initPassword = response.msg;
+        // this.form.password = this.initPassword;
+      }
+    });
   },
 
   methods: {
@@ -335,7 +341,7 @@ export default {
             this.roleOptions = response.roles;
             this.open = true;
             this.title = "添加用户";
-            // this.form.password = this.initPassword;
+            this.form.password = this.initPassword;
           });
         }else{
           getUser(this.userId).then(response => {
diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue
index 42ab89f0..ac8381d1 100644
--- a/src/views/emis/emisWaybill/batchWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue
@@ -57,7 +57,7 @@
               <el-tag v-if="scope.row.uploadStatus==-1" type="danger">下单异常</el-tag>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('异常信息')" align="left" prop="errorInfo" min-width="120" :show-overflow-tooltip="true" >
+      <el-table-column :label="$t('异常信息')" align="center" prop="errorInfo" min-width="300" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
               <span v-if="scope.row.uploadStatus==-1" style="color:red">{{ scope.row.errorInfo }}</span>
               <span v-if="scope.row.uploadStatus==1">下单成功</span>
@@ -71,7 +71,7 @@
       <el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="80" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" />
-      <el-table-column :label="$t('快递员')"  align="center" prop="operateEmployeeCode" min-width="100"/>
+      <el-table-column :label="$t('取件员/操作员')"  align="center" prop="operateEmployeeCode" min-width="100"/>
           <el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="80" />
       <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" />
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
@@ -95,6 +95,9 @@
       <el-table-column :label="$t('寄件区')" align="center" prop="sendCounty" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
 
+      <el-table-column :label="$t('月结客户')" align="center" prop="custNo" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="80" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" />
       <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="80" />
@@ -456,12 +459,14 @@ export default {
         // 运单号	收件人	收件电话	收件国	收件省	收件市	收件区	收件公司	收件地址
         // 寄件人	寄件电话	寄件国	寄件省	寄件市	寄件区	寄件公司	寄件地址
         // 线路	产品类型	报关方式	清关方式	快递员	货物名称	包装类型	件数	实际重量	体积
-        // 取件方式	派送方式	运费	支付方式	月结账号	回款联系人	销售联系人	费用备注
+        // 取件方式	派送方式	运费	支付方式	月结客户	回款联系人	销售联系人	费用备注
+        // 取件员/操作员
+        // 寄件/签收短信
         let rowIndex=element['__rowNum__']
         let orderData={
                 billCode: element['运单号'],
                 sendDate: parseTime(new Date()),
-                custNo:  element['月结账号'],
+                custNo:  element['月结客户'],
                 receiveName: element['收件人'],
                 receiveCompany:element['收件公司'],
                 receiveMobile:element['收件电话'],
@@ -495,8 +500,10 @@ export default {
                 feeRemark:element['费用备注'],
                 payee: element['回款联系人'],
                 salesmen: element['销售联系人'],
-                operateEmployeeCode: element['快递员'],
+                operateEmployeeCode: element['取件员/操作员'],
                 remark:  element['录单备注'],
+                blMessage:  element['寄件/签收短信'],
+
                 uploadStatus: 0,
                 errorInfo:'',
         }
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index d8e3d574..2bf9d23a 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -665,6 +665,7 @@ export default {
       billCode:null,
 
       openTraceInfo:false,
+      currentTraceBillItem:null,
       currentTraceBillCode:null,
       dateRange:[],
 
@@ -891,8 +892,10 @@ export default {
 
       return '';
     },
+
     handleShowTraceInfo(row){
         this.currentTraceBillCode=row.billCode;
+        this.currentTraceBillItem=row;
         this.openTraceInfo=true;
     },
     /** 查询运单列表列表 */
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index a381b15d..4d0d1c82 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -665,6 +665,7 @@ export default {
       billCode:null,
 
       openTraceInfo:false,
+      currentTraceBillItem:null,
       currentTraceBillCode:null,
       dateRange:[],
 
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index e2c96e43..b8901b51 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -1720,9 +1720,11 @@ methods: {
     }
 
     let totalFee=0;
-    this.form.feeItems.forEach(item=>{
-      totalFee=totalFee+parseInt(item.realFee);
-    });
+    if(this.form.feeItems&&this.form.feeItems.length>0){
+      this.form.feeItems.forEach(item=>{
+        totalFee=totalFee+parseInt(item.realFee);
+      });
+    }
     this.form.freight = totalFee;
   },
   // 计算体积重量
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 541f99ba..83e7de98 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1720,9 +1720,11 @@ methods: {
     }
 
     let totalFee=0;
-    this.form.feeItems.forEach(item=>{
-      totalFee=totalFee+parseInt(item.realFee);
-    });
+    if(this.form.feeItems&&this.form.feeItems.length>0){
+      this.form.feeItems.forEach(item=>{
+        totalFee=totalFee+parseInt(item.realFee);
+      });
+    }
     this.form.freight = totalFee;
   },
   // 计算体积重量