优化

src/views/audit/store/components/deliveryGoodsInfo.vue

@@ -85,8 +85,8 @@
         <div class="g-label">物料信息</div>
         <div class="g-cont">
           <div class="g-total">
-            <span class="name-label">重量合计：</span>
-            <span class="total-num">{{totalWeight}}kg</span>
+            <span class="name-label">重量合计(kg)：</span>
+            <span class="total-num">{{totalWeight}}</span>
           </div>
         </div>
       </div>
@@ -233,6 +233,8 @@ export default class DeliveryGoodsInfo extends Vue {
             placeholder:'请选择出库仓库',
             clearable:true,
             retConfig:{
+              tmsShipmentConsignor:'shipper',
+              tmsShipmentContacts:'shipperPhone',
               tmsShipmentProvince: 'province',
               tmsShipmentProvinceNo:'provinceCode',
               tmsShipmentCity: 'city',
@@ -297,6 +299,8 @@ export default class DeliveryGoodsInfo extends Vue {
             placeholder:'请选择仓库',
             clearable:true,
             retConfig:{
+              tmsUnloadingConsignor:'shipper',
+              tmsUnloadingContacts:'shipperPhone',
               tmsUnloadingProvince: 'province',
               tmsUnloadingProvinceNo:'provinceCode',
               tmsUnloadingCity: 'city',

src/views/oms/B2BOrder/components/batchbyOneModal.vue

@@ -91,7 +91,9 @@ export default class BatchbyOneModal extends Vue {
     })
   }
   setInfo(){
-    (this.$refs.info as any).setValue(this.data[this.currentOrder]);
+    if(this.data[this.currentOrder]){
+      (this.$refs.info as any).setValue(this.data[this.currentOrder]);
+    }
   }
   setValue(data:Array<any>){
     this.data = [];
@@ -321,20 +323,20 @@ export default class BatchbyOneModal extends Vue {
         if(!isNext){
           //寻找未发货的订单
           this.noSentOrder();
-          let _item:any = this.data[this.currentOrder];
           //是否是最后一单
-            if(this.currentOrder >= this.data.length){
-              this.drawer = false;
-            }else{
-              this.sendGoods(_item);
-              // if(this.currentPrice[_item.omsOrderIds]){
-              //   this.sendGoods(_item);
-              // }
-              // else{
-              //   this.getPriceInfo(_item,this.sendGoods)
-              //   // this.getStoreCount(_item,this.getPriceInfo);
-              // }
-            }
+          if(this.currentOrder >= this.data.length){
+            this.drawer = false;
+          }else{
+            let _item:any = this.data[this.currentOrder];
+            this.sendGoods(_item);
+            // if(this.currentPrice[_item.omsOrderIds]){
+            //   this.sendGoods(_item);
+            // }
+            // else{
+            //   this.getPriceInfo(_item,this.sendGoods)
+            //   // this.getStoreCount(_item,this.getPriceInfo);
+            // }
+          }
         }else{
           if(this.currentOrder < this.data.length - 1) {
             this.currentOrder ++;

src/views/oms/B2BOrder/components/deliveryDetail.vue

@@ -9,11 +9,11 @@
     size="50%">
     <div class="content" v-if="value.orderType == 'B2B'">
       <deliveryGoodsInfo :sendState="true" ref="info" :readOnly="true" />
-      <div class="send-box">
+      <!-- <div class="send-box">
         <div class="pri-title">
-          <!-- <div class="title-item">
+          <div class="title-item">
             预计送达和预计费用<span>明细></span>
-          </div> -->
+          </div>
           <div class="title-item">
             实际送达和实际费用
           </div>
@@ -57,9 +57,20 @@
             </div>
           </el-popover>
         </div>
-      </div>
+      </div> -->
       
-      <div class="space"></div>
+      <!-- <div class="space"></div> -->
+
+      <div class="send-box">
+        <div class="s-row">
+          <div class="s-col width50">TMS状态：{{ getTMSStatus(value.tmsOrderStatus) }}</div>
+          <div class="s-col width50">WMS状态：{{ getWmsState(value.wmsOrderStatus) }}</div>
+        </div>
+        <div class="s-row">
+          <div class="s-col width50">WMS发货类型：{{ getSendType(value.wmsSendType) }}</div>
+          <div class="s-col width50">WMS编号：{{ value.wmsSyncId }}</div>
+        </div>
+      </div>
       <div class="deli-footer">
         <div class="send-btn" @click="showLogistics">物流信息</div>
         <div class="send-btn" @click="cancelDelivery">取消发货</div>
@@ -118,6 +129,40 @@ export default class DeliveryDetail extends Vue {
     this.value={}
     this.priceData=[];
   }
+  getTMSStatus(v:any){
+    let n = '';
+    switch(v){
+      case 0:
+        n = '创建';
+        break;
+      case 5:
+        n = '已分派';
+        break;
+      case 10:
+        n = '已派车';
+        break;
+      case 15:
+        n = '已提货';
+        break;
+      case 20:
+        n = '已发运';
+        break;
+      case 30:
+        n = '已送达';
+        break;
+      case 35:
+        n = '已回单';
+        break;
+      case -1:
+        n = '已撤回';
+        break;
+      case -2:
+        n = '取消';
+        break;
+    }
+
+    return n;
+  }
   getWmsState(s:any){
     let n = '';
     switch(s){
@@ -159,6 +204,7 @@ export default class DeliveryDetail extends Vue {
           })
         }
       }
+      this.value.weight = Number(this.value.tmsTotalWeight)
       this.load = false;
       if(res.data.pricePlan){
         try{
@@ -208,6 +254,18 @@ export default class DeliveryDetail extends Vue {
       }).catch(() => {});
     }
   }
+
+  getSendType(v:string){
+    let n = v;
+    if(v === 'YKCK'){
+      n = '越库出库'
+    }else if(v === 'B2BCK'){
+      n = 'B2B出库'
+    }else if(v === 'B2CCK'){
+      n = 'B2C出库'
+    }
+    return n;
+  }
 }
 </script>
 <style lang="scss" scoped>

src/views/oms/B2BOrder/components/deliveryGoodsInfo.vue

@@ -291,6 +291,8 @@ export default class DeliveryGoodsInfo extends Vue {
             clearable:true,
             defaultIndex:0,
             retConfig:{
+              tmsShipmentConsignor:'shipper',
+              tmsShipmentContacts:'shipperPhone',
               tmsShipmentProvince: 'province',
               tmsShipmentProvinceNo:'provinceCode',
               tmsShipmentCity: 'city',

src/views/oms/B2COrder/components/expressDeliveryModal.vue

@@ -39,8 +39,8 @@
             <div class="g-label">物料信息</div>
             <div class="g-cont">
               <div class="g-total">
-                <span class="name-label">重量合计：</span>
-                <span class="total-num">{{totalWeight}}g</span>
+                <span class="name-label">重量合计(kg)：</span>
+                <span class="total-num">{{totalWeight}}</span>
               </div>
             </div>
           </div>
@@ -98,7 +98,7 @@ export default class ExpressDeliveryModal extends Vue {
   checked=false;
   stopHandle=false;
   data:Array<any>=[]
-  totalWeight=0;
+  totalWeight:any=0;
   value:any = {}
   showModal=false;
   config:any={
@@ -279,6 +279,9 @@ export default class ExpressDeliveryModal extends Vue {
         }
       }
     }
+    if(this.totalWeight){
+      this.totalWeight = divide(this.totalWeight,1000)?.toFixed(3)
+    }
     this.$nextTick(() => {
       this.edit()
     })