优化

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

@@ -137,7 +137,7 @@ export default class BatchbyOneModal extends Vue {
     //   this.$message('请阅读并同意运单协议！')
     //   return
     // }
-    if(!this.data[this.currentOrder].tmsShipmentAddress || !this.data[this.currentOrder].tmsShipmentConsignor || !this.data[this.currentOrder].tmsUnloadingAddress || !this.data[this.currentOrder].tmsUnloadingConsignor){
+    if(!this.data[this.currentOrder].tmsShipmentConsignor || !this.data[this.currentOrder].tmsUnloadingConsignor || !this.data[this.currentOrder].storeHouseId){
       this.$message("请编辑订单信息");
       return
     }
@@ -176,8 +176,9 @@ export default class BatchbyOneModal extends Vue {
     if(!item){
       return
     }
+    console.log('asasa',item)
     let params:any={};
-    params.storeHouseId = item.storeHouseId;
+    params.storeHouseId = item.out_storeHouseId;
     params.skuIds=[];
     if(item.subItem){
       for(const i of item.subItem){
@@ -231,24 +232,30 @@ export default class BatchbyOneModal extends Vue {
     if(this.currentPrice[item.omsOrderIds]){
       params.priceId = this.currentPrice[item.omsOrderIds].id;
     }
-    // params.omsOrderIds = [item.omsOrderIds];
     params.tmsMaterials=[];
     if(item.subItem){
       let skuIds:Array<any>=[];
       for(const i of item.subItem){
-        if(skuIds.indexOf(item.omsOrderItemId) == -1){
+        let ind = skuIds.indexOf(item.omsOrderItemId)
+        if(ind == -1){
           skuIds.push(item.omsOrderItemId);
           params.tmsMaterials.push({
             qty:i.tmsQuantity,
             storeHouseId:item.storeHouseId,
             materialSkuId:i.omsOrderItemId
           })
+        }else{
+          for(let paramsItem of params.tmsMaterials){
+            if(paramsItem.materialSkuId == i.omsOrderItemId){
+              paramsItem.qty = add(Number(paramsItem.qty),Number(i.tmsQuantity))
+              break
+            }
+          }
         }
         
       }
     }
     delete params.subItem;
-    // console.log(params)
     this.load = true;
     WMSAddEntryOrder(params).then((res:any) => {
       this.load = false;
@@ -318,8 +325,8 @@ export default class BatchbyOneModal extends Vue {
   //获取价格
   getPriceInfo(data:any,callback?:Function){
     let params:any={};
-    params.startAddressCode = data.tmsShipmentCityNo + '00000';
-    params.endAddressCode = data.tmsUnloadingCityNo + '00000';
+    params.startStoreHouseId = data.out_storeHouseId;
+    params.endStoreHouseId = data.entry_storeHouseId;
     params.materialInfos = []
     if(data.subItem){
       for(const i of data.subItem){

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

@@ -17,13 +17,10 @@
         </div>
       </div> -->
       <div class="info-row">
-        <div class="info-col">
+        <div class="info-col col-width">
           <span class="label">业务员：</span>
           <span :title="value.tmsBusinessMan">{{ value.tmsBusinessMan }}</span>
         </div>
-        
-      </div>
-      <div class="info-row">
         <div class="info-col col-width">
           <span class="label">业务员手机：</span>
           <span :title="value.tmsBusinessPhone">{{ value.tmsBusinessPhone }}</span>
@@ -31,8 +28,8 @@
       </div>
       <div class="info-row"> 
         <div class="info-col col-width">
-          <span class="label">运输方式：</span>
-          <span :title="value.tmsTransportMethod">{{ value.tmsTransportMethod }}</span>
+          <span class="label">入库方式：</span>
+          <span :title="value.tmsTransportMethod">{{ value.sendType }}</span>
         </div>
         <div class="info-col col-width">
           <span class="label">备注：</span>
@@ -43,54 +40,15 @@
     <div class="g-box">
       <div class="info-row">
         <div class="info-col col-width">
-          <span class="label">发货省：</span>
-          <span :title="value.tmsShipmentProvince">{{ value.tmsShipmentProvince }}</span>
-        </div>
-        <div class="info-col col-width">
-          <span class="label">收货省：</span>
-          <span :title="value.tmsUnloadingProvince">{{ value.tmsUnloadingProvince }}</span>
-        </div>
-      </div>
-      <div class="info-row">
-        <div class="info-col col-width">
-          <span class="label">发货市：</span>
-          <span :title="value.tmsShipmentCity">{{ value.tmsShipmentCity }}</span>
-        </div>
-        <div class="info-col col-width">
-          <span class="label">收货市：</span>
-          <span :title="value.tmsUnloadingCity">{{ value.tmsUnloadingCity }}</span>
-        </div>
-      </div>
-      <div class="info-row">
-        <div class="info-col col-width">
-          <span class="label">发货区（县）：</span>
-          <span :title="value.tmsShipmentRegion">{{ value.tmsShipmentRegion }}</span>
-        </div>
-        <div class="info-col col-width">
-          <span class="label">收货区（县）：</span>
-          <span :title="value.tmsUnloadingRegion">{{ value.tmsUnloadingRegion }}</span>
-        </div>
-      </div>
-      <div class="info-row">
-        <div class="info-col col-width">
-          <span class="label">发货街道：</span>
-          <span :title="value.tmsShipmentStreet">{{ value.tmsShipmentStreet }}</span>
-        </div>
-        <div class="info-col col-width">
-          <span class="label">收货街道：</span>
-          <span :title="value.tmsUnloadingStreet">{{ value.tmsUnloadingStreet }}</span>
-        </div>
-      </div>
-      <div class="info-row">
-        <div class="info-col col-width">
-          <span class="label">发货地址（详情）：</span>
-          <span :title="value.tmsShipmentAddress">{{ value.tmsShipmentAddress }}</span>
+          <span class="label">出库仓库：</span>
+          <span :title="value.out_storeHouseName">{{ value.out_storeHouseName }}</span>
         </div>
         <div class="info-col col-width">
-          <span class="label">收货地址（详情）：</span>
-          <span :title="value.tmsUnloadingAddress">{{ value.tmsUnloadingAddress }}</span>
+          <span class="label">入库仓库：</span>
+          <span :title="value.entry_storeHouseName">{{ value.entry_storeHouseName }}</span>
         </div>
       </div>
+      
       <div class="info-row">
         <div class="info-col col-width">
           <span class="label">发货人：</span>
@@ -203,26 +161,29 @@ export default class DeliveryGoodsInfo extends Vue {
         tmsShipmentContacts:[{
           required: true, message: '发货人电话不能为空！', trigger: 'blur'
         }],
-        tmsShipmentProvince:[{
-          required: true, message: '请选择发货地址！', trigger: 'change'
-        }],
-        tmsShipmentAddress:[{
-          required: true, message: '发货地址不能为空！', trigger: 'blur'
-        }],
+        // tmsShipmentProvince:[{
+        //   required: true, message: '请选择发货地址！', trigger: 'change'
+        // }],
+        // tmsShipmentAddress:[{
+        //   required: true, message: '发货地址不能为空！', trigger: 'blur'
+        // }],
         tmsUnloadingConsignor:[{
           required: true, message: '收货人不能为空！', trigger: 'blur'
         }],
         tmsUnloadingContacts:[{
           required: true, message: '收货人电话不能为空！', trigger: 'blur'
         }],
-        tmsUnloadingProvince:[{
-          required: true, message: '请选择收货地址！', trigger: 'change'
-        }],
-        tmsUnloadingAddress:[{
-          required: true, message: '收货地址不能为空！', trigger: 'blur'
+        // tmsUnloadingProvince:[{
+        //   required: true, message: '请选择收货地址！', trigger: 'change'
+        // }],
+        // tmsUnloadingAddress:[{
+        //   required: true, message: '收货地址不能为空！', trigger: 'blur'
+        // }],
+        out_storeHouseId:[{
+          required: true, message: '请选择出库仓库！', trigger: 'change'
         }],
-        storeHouseId:[{
-          required: true, message: '请选择仓库！', trigger: 'change'
+        entry_storeHouseId:[{
+          required: true, message: '请选择入库仓库！', trigger: 'change'
         }],
         tmsArrivalDate:[{
           required: true, message: '期望送达时间不能为空！', trigger: 'blur'
@@ -234,7 +195,7 @@ export default class DeliveryGoodsInfo extends Vue {
         //   required: true, message: '运输方式不能为空！', trigger: 'change'
         // }],
         sendType: [{
-          required: true, message: '出库方式不能为空！', trigger: 'change'
+          required: true, message: '入库方式不能为空！', trigger: 'change'
         }]
       }
     },
@@ -259,12 +220,13 @@ export default class DeliveryGoodsInfo extends Vue {
         }
       }],
       [{
-        label:'仓库',
-        prop:'storeHouseId',
+        span:12,
+        label:'出库仓库',
+        prop:'out_storeHouseId',
         component:'warehouse',
         compConfig:{
           attr:{
-            placeholder:'请选择仓库',
+            placeholder:'请选择出库仓库',
             clearable:true,
             retConfig:{
               tmsShipmentProvince: 'province',
@@ -275,31 +237,34 @@ export default class DeliveryGoodsInfo extends Vue {
               tmsShipmentRegionNo: 'regionCode',
               tmsShipmentStreetNo: 'streetCode',
               tmsShipmentStreet: 'street',
-              storeHouseId: 'id'
+              out_storeHouseId: 'id',
+              out_storeHouseName:'name'
             }
           }
         }
-      },{
-        span:12,
-        label:'出库方式',
-        prop:'sendType',
-        component:'by-select',
-        compConfig:{
-          attr:{
-            clearable:true,
-            data: [{
-              label:'越库出库',
-              value:'YKCK'
-            },{
-              label:'B2B出库',
-              value:'B2BCK'
-            },{
-              label:'B2C出库',
-              value:'B2CCK'
-            }]
-          }
-        }
-      }],
+      }
+      // ,{
+      //   span:12,
+      //   label:'出库方式',
+      //   prop:'sendType',
+      //   component:'by-select',
+      //   compConfig:{
+      //     attr:{
+      //       clearable:true,
+      //       data: [{
+      //         label:'越库出库',
+      //         value:'YKCK'
+      //       },{
+      //         label:'B2B出库',
+      //         value:'B2BCK'
+      //       },{
+      //         label:'B2C出库',
+      //         value:'B2CCK'
+      //       }]
+      //     }
+      //   }
+      // }
+      ],
       [{
         label:'发货人',
         prop:'tmsShipmentConsignor',
@@ -320,36 +285,80 @@ export default class DeliveryGoodsInfo extends Vue {
         }
       }],
       [{
-        labelWidth:'120px',
-        label:'发货地址选择',
-        prop:'tmsShipmentProvince',
-        component:'by-area',
+        label:'入库仓库',
+        prop:'entry_storeHouseId',
+        component:'warehouse',
         compConfig:{
           attr:{
-            province:'tmsShipmentProvince', //省
-            provinceCode:'tmsShipmentProvinceNo', //省编码
-            city:'tmsShipmentCity',   //市
-            cityCode:'tmsShipmentCityNo',  //市编码
-            county:'tmsShipmentRegion',  //县/区
-            countyCode:'tmsShipmentRegionNo',   //县/区编码
-            townCode:'tmsShipmentStreetNo',
-            town:'tmsShipmentStreet',
-            broadcastConfig:{
-              name: 'warehouseChange'
+            placeholder:'请选择仓库',
+            clearable:true,
+            retConfig:{
+              tmsUnloadingProvince: 'province',
+              tmsUnloadingProvinceNo:'provinceCode',
+              tmsUnloadingCity: 'city',
+              tmsUnloadingCityNo: 'cityCode',
+              tmsUnloadingRegion: 'region',
+              tmsUnloadingRegionNo: 'regionCode',
+              tmsUnloadingStreetNo: 'streetCode',
+              tmsUnloadingStreet: 'street',
+              entry_storeHouseId: 'id',
+              entry_storeHouseName:'name'
             }
           }
         }
-      }],
-      [{
-        label:'发货地址',
-        prop:'tmsShipmentAddress',
-        component:'by-input',
+      },{
+        span:12,
+        label:'入库方式',
+        prop:'sendType',
+        component:'by-select',
         compConfig:{
           attr:{
-            clearable:true
+            clearable:true,
+            defaultIndex: 0,
+            data: [{
+              label:'B2B入库',
+              value:'B2BRK'
+            },{
+              label:'越库出库',
+              value:'YKCK'
+            },{
+              label:'B2C入库',
+              value:'B2CRK'
+            }]
           }
         }
       }],
+      // [{
+      //   labelWidth:'120px',
+      //   label:'发货地址选择',
+      //   prop:'tmsShipmentProvince',
+      //   component:'by-area',
+      //   compConfig:{
+      //     attr:{
+      //       province:'tmsShipmentProvince', //省
+      //       provinceCode:'tmsShipmentProvinceNo', //省编码
+      //       city:'tmsShipmentCity',   //市
+      //       cityCode:'tmsShipmentCityNo',  //市编码
+      //       county:'tmsShipmentRegion',  //县/区
+      //       countyCode:'tmsShipmentRegionNo',   //县/区编码
+      //       townCode:'tmsShipmentStreetNo',
+      //       town:'tmsShipmentStreet',
+      //       broadcastConfig:{
+      //         name: 'warehouseChange'
+      //       }
+      //     }
+      //   }
+      // }],
+      // [{
+      //   label:'发货地址',
+      //   prop:'tmsShipmentAddress',
+      //   component:'by-input',
+      //   compConfig:{
+      //     attr:{
+      //       clearable:true
+      //     }
+      //   }
+      // }],
       [{
         label:'收货人',
         prop:'tmsUnloadingConsignor',
@@ -369,34 +378,34 @@ export default class DeliveryGoodsInfo extends Vue {
           }
         }
       }],
-      [{
-        labelWidth:'120px',
-        label:'收货地址选择',
-        prop:'tmsUnloadingProvince',
-        component:'by-area',
-        compConfig:{
-          attr:{
-            province:'tmsUnloadingProvince', //省
-            provinceCode:'tmsUnloadingProvinceNo', //省编码
-            city:'tmsUnloadingCity',   //市
-            cityCode:'tmsUnloadingCityNo',  //市编码
-            county:'tmsUnloadingRegion',  //县/区
-            countyCode:'tmsUnloadingRegionNo',   //县/区编码
-            townCode:'tmsUnloadingStreetNo',
-            town:'tmsUnloadingStreet'
-          }
-        }
-      }],
-      [{
-        label:'收货人地址',
-        prop:'tmsUnloadingAddress',
-        component:'by-input',
-        compConfig:{
-          attr:{
-            clearable:true
-          }
-        }
-      }],
+      // [{
+      //   labelWidth:'120px',
+      //   label:'收货地址选择',
+      //   prop:'tmsUnloadingProvince',
+      //   component:'by-area',
+      //   compConfig:{
+      //     attr:{
+      //       province:'tmsUnloadingProvince', //省
+      //       provinceCode:'tmsUnloadingProvinceNo', //省编码
+      //       city:'tmsUnloadingCity',   //市
+      //       cityCode:'tmsUnloadingCityNo',  //市编码
+      //       county:'tmsUnloadingRegion',  //县/区
+      //       countyCode:'tmsUnloadingRegionNo',   //县/区编码
+      //       townCode:'tmsUnloadingStreetNo',
+      //       town:'tmsUnloadingStreet'
+      //     }
+      //   }
+      // }],
+      // [{
+      //   label:'收货人地址',
+      //   prop:'tmsUnloadingAddress',
+      //   component:'by-input',
+      //   compConfig:{
+      //     attr:{
+      //       clearable:true
+      //     }
+      //   }
+      // }],
       [{
         label:'期望送达时间',
         prop:'tmsArrivalDate',
@@ -463,6 +472,7 @@ export default class DeliveryGoodsInfo extends Vue {
     }
   }
   hide(){
+    (this.$refs.form as any).clearValue();
     this.$emit('editState',true)
   }
   show(){
@@ -470,7 +480,10 @@ export default class DeliveryGoodsInfo extends Vue {
     this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
     this.$nextTick(()=>{
       if(this.$refs.form){
-        (this.$refs.form as any).clearValue();
+        let value = (this.$refs.form as any).getValue();
+        for(const key in value){
+          this.value[key] = value[key]
+        }
         (this.$refs.form as any).setValue(this.value);
       }
     })
@@ -483,34 +496,7 @@ export default class DeliveryGoodsInfo extends Vue {
     if(this.$refs.form){
       (this.$refs.form as any).validate().then(()=>{
         this.value = (this.$refs.form as any).getValue();
-        if(!this.value.tmsShipmentCity){
-          this.$message({
-            message:'请选择发货城市！',
-            type:'warning'
-          })
-          return
-        }
-        if(!this.value.tmsShipmentRegion){
-          this.$message({
-            message:'请选择发货区/县！',
-            type:'warning'
-          })
-          return
-        }
-        if(!this.value.tmsUnloadingCity){
-          this.$message({
-            message:'请选择收货城市！',
-            type:'warning'
-          })
-          return
-        }
-        if(!this.value.tmsUnloadingRegion){
-          this.$message({
-            message:'请选择收货区/县！',
-            type:'warning'
-          })
-          return
-        }
+        
         this.showModal = false;
         this.$emit('editState',true);
         this.$emit('editResult',this.value);

src/views/oms/order/components/addOrder.vue

@@ -148,6 +148,7 @@
             <el-radio :label="0">待付款</el-radio>
             <el-radio :label="1">快速支付&已付款</el-radio>
             <el-radio :label="2">手工添加支付信息</el-radio>
+            <el-radio :label="3">货到付款</el-radio>
           </el-radio-group>
           <by-form v-if="radioPay == 2" :propConfig="payConfig" ref="payform"></by-form>
         </el-collapse-item>
@@ -291,7 +292,20 @@ export default class AddOrder extends Vue {
             clearable:true
           }
         }
-      },{
+      },
+      // {
+      //   span:6,
+      //   label:'快递单号',
+      //   prop:'logisticsId',
+      //   component:'by-input',
+      //   compConfig:{
+      //     attr:{
+      //       readonly:true,
+      //       clearable:true
+      //     }
+      //   }
+      // },
+      {
         span:6,
         label:'业务员',
         prop:'createBy',
@@ -425,11 +439,11 @@ export default class AddOrder extends Vue {
         label:'买家账号',
         prop:'buyerId',
         component:'by-input',
-        compConfig:{
-          attr:{
-            type:'integer'
-          }
-        }
+        // compConfig:{
+        //   attr:{
+        //     type:'integer'
+        //   }
+        // }
       },{
         span:6,
         label:'收货人',
@@ -909,13 +923,17 @@ export default class AddOrder extends Vue {
     }else{
       this.radioPay = 2;
     }
+    if(this.orderValue.isCod == 1) {
+      this.radioPay = 3
+    }
   }
   //订单支付情况单选值
   inputPay(v:number){
     this.orderValue.isPay = null;
-    if(v != 2){
+    if(v === 0 || v === 1){
       this.orderValue.isPay = v;
     }
+    this.orderValue.isCod = v === 3 ? 1:0
   }
   created(){
     this.userInfo = this.$store.getters.userInfo;
@@ -1050,6 +1068,7 @@ export default class AddOrder extends Vue {
     if(this.$refs.tool){
       (this.$refs.tool as any).initTools();
     }
+    console.log('值：',this.orderValue)
     if(this.orderValue.id){
       let data = this.orderValue;
       this.freeAmount = this.orderValue.freeAmount;
@@ -1065,6 +1084,7 @@ export default class AddOrder extends Vue {
       info.buyerMessage = data.buyerMessage;
       info.remark = data.remark;
       info.labels = data.labels;
+      info.logisticsId = data.logisticsId;
       info.sourceFrom = data.sourceFrom;
       this.baseConfig.attr.data = info;
       (this.$refs.baseform as any).setValue(info);
@@ -1113,6 +1133,9 @@ export default class AddOrder extends Vue {
       if(this.orderValue.isPay != 0 || this.orderValue.isPay != 1){
         this.radioPay == 2
       }
+      if(data.isCod == 1) {
+        this.radioPay == 3
+      }
       //发票
       if(data.invoices && data.invoices[0]){
         (this.$refs.invoicesform as any).setValue(data.invoices[0]);
@@ -1120,6 +1143,10 @@ export default class AddOrder extends Vue {
       if(this.orderValue.isSubmitted == 1){
         this.baseConfig.attr.showType='desc';
         this.baseConfig.attr.size='medium';
+        this.baseConfig.columns[1].splice(2,0,{
+          label:'快递单号',
+          prop:'logisticsId'
+        })
       }else{
         for(let col of this.baseConfig.columns){
           for(let item of col){
@@ -1188,7 +1215,9 @@ export default class AddOrder extends Vue {
           this.orderValue.freeAmount = multiply(this.productTotal,n)
         }
       }
-      this.orderValue.freeAmount = this.orderValue.freeAmount.toFixed(2);
+      this.orderValue.freeAmount = this.orderValue.freeAmount?this.orderValue.freeAmount.toFixed(2):0;
+    }else{
+      this.orderValue.freeAmount = 0
     }
   }
   //应付总金额
@@ -1391,6 +1420,8 @@ export default class AddOrder extends Vue {
         }
         if(this.orderValue.freight){
           this.orderValue.freight = Math.floor(Number(this.orderValue.freight) * 100) / 100;
+        }else{
+          this.orderValue.freight = 0
         }
         
         //买家信息
@@ -1418,11 +1449,10 @@ export default class AddOrder extends Vue {
             });
             reject();
           }
-          if(this.radioPay != 2){
+          if(this.radioPay === 0 || this.radioPay === 1){
             this.orderValue.isPay = this.radioPay;
             this.orderValue.pays = []
           }
-
           if(this.radioPay == 2){
             (this.$refs.payform as any).validate({noMsg:true}).then(()=>{
               this.orderValue.pays = [];
@@ -1443,6 +1473,7 @@ export default class AddOrder extends Vue {
           }else{
             resolve();
           }
+
           
         }).catch(()=>{
           if(r){
@@ -1467,10 +1498,11 @@ export default class AddOrder extends Vue {
 
       let invoiceValue = (this.$refs.invoicesform as any).getValue();
       this.orderValue.invoices=[];
-      this.orderValue.invoices.push(invoiceValue);
+      if(JSON.stringify(invoiceValue) !== '{}'){
+        this.orderValue.invoices.push(invoiceValue);
+      }
     })
-    
-  }
+  } 
   //确定
   btn(n?:string){
     this.getOrderValue().then(()=>{

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

@@ -299,18 +299,20 @@ export default class BatchbyOneModal extends Vue {
     if(item.subItem){
       let skuIds:Array<any>=[];
       for(const i of item.subItem){
-        if(skuIds.indexOf(item.omsOrderItemId) == -1){
-          skuIds.push(item.omsOrderItemId);
-          params.tmsMaterials.push({
-            storeHouseId:item.storeHouseId,
-            materialSkuId:i.omsOrderItemId
-          })
-        }
-        
+        params.tmsMaterials.push({
+          storeHouseId:item.storeHouseId,
+          materialSkuId:i.omsOrderItemId
+        })
+        // if(skuIds.indexOf(item.omsOrderItemId) == -1){
+        //   skuIds.push(item.omsOrderItemId);
+        //   params.tmsMaterials.push({
+        //     storeHouseId:item.storeHouseId,
+        //     materialSkuId:i.omsOrderItemId
+        //   })
+        // }
       }
     }
     delete params.subItem;
-    // console.log(params)
     this.load = true;
     addmultiple(params).then((res:any) => {
       this.load = false;

src/views/oms/order/components/carpoolModal.vue

@@ -162,13 +162,17 @@ export default class CarpoolModal extends Vue {
     if(this.value.subItem){
       let skuIds:Array<any>=[];
       for(const item of this.value.subItem){
-        if(skuIds.indexOf(item.omsOrderItemId) == -1){
-          skuIds.push(item.omsOrderItemId);
-          params.tmsMaterials.push({
-            storeHouseId:this.value.storeHouseId,
-            materialSkuId:item.omsOrderItemId
-          })
-        }
+        params.tmsMaterials.push({
+          storeHouseId:this.value.storeHouseId,
+          materialSkuId:item.omsOrderItemId
+        })
+        // if(skuIds.indexOf(item.omsOrderItemId) == -1){
+        //   skuIds.push(item.omsOrderItemId);
+        //   params.tmsMaterials.push({
+        //     storeHouseId:this.value.storeHouseId,
+        //     materialSkuId:item.omsOrderItemId
+        //   })
+        // }
         
       }
     }

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

@@ -1,13 +1,13 @@
 <template>
   <el-drawer
     append-to-body
-    title="订单发货"
+    title="发货详情"
     v-loading="load"
     :visible.sync="drawer"
     @close="close"
     :direction="direction"
     size="50%">
-    <div class="content">
+    <div class="content" v-if="value.orderType == 'B2B'">
       <deliveryGoodsInfo :sendState="true" ref="info" :readOnly="true" />
       <div class="send-box">
         <div class="pri-title">
@@ -58,9 +58,30 @@
           </el-popover>
         </div>
       </div>
+      
+      <div class="space"></div>
+      <div class="deli-footer">
+        <div class="send-btn" @click="showLogistics">物流信息</div>
+        <div class="send-btn" @click="cancelDelivery">取消发货</div>
+      </div>
+    </div>
+    <div class="content" v-if="value.orderType == 'B2C'">
       <div class="send-box">
         <div class="s-row">
-          <div class="s-col">WMS销售订单号：{{ value.wmsSaleorderCode }}</div>
+          <div class="s-col width50">业务员：{{ value.tmsBusinessMan }}</div>
+          <div class="s-col width50">业务员手机：{{ value.tmsBusinessPhone }}</div>
+        </div>
+        <div class="s-row">
+          <div class="s-col width50">店铺名称：{{ value.wmsShopName }}</div>
+          <div class="s-col width50">快递单号：{{ value.wmsExpressCode }}</div>
+        </div>
+        <div class="s-row">
+          <div class="s-col width50">快递公司：{{ value.wmsLogisticsName }}</div>
+          <div class="s-col width50">快递公司编码：{{ value.wmsLogisticsCode }}</div>
+        </div>
+        <div class="s-row">
+          <div class="s-col width50">WMS销售订单号：{{ value.wmsSaleorderCode }}</div>
+          <div class="s-col width50">WMS费用：{{ value.wmsTotalAmount }}</div>
         </div>
         <div class="s-row">
           <div class="s-col width50">WMS订单类型：{{ value.wmsSendType }}</div>
@@ -70,11 +91,6 @@
           <div class="s-col">WMS取消订单的备注：{{ value.wmsRemark }}</div>
         </div>
       </div>
-      <div class="space"></div>
-      <div class="deli-footer">
-        <div class="send-btn" @click="showLogistics">物流信息</div>
-        <div class="send-btn" @click="cancelDelivery">取消发货</div>
-      </div>
     </div>
   </el-drawer>
 </template>
@@ -153,9 +169,12 @@ export default class DeliveryDetail extends Vue {
         }
         
       }
-      if(this.$refs.info){
-        (this.$refs.info as any).setValue(this.value)
-      }
+      setTimeout(()=>{
+        if(this.$refs.info){
+          (this.$refs.info as any).setValue(this.value)
+        }
+      },1000)
+      
     }).catch(() => {
       this.load = false;
     })
@@ -203,7 +222,7 @@ export default class DeliveryDetail extends Vue {
     padding: 16px;
     padding-bottom: 0;
     margin-bottom: 16px;
-    background-color: rgba(255, 226, 160, 0.3);
+    background-color: rgba(160,205,255,0.22);
     .pri-title{
       width: 100%;
       padding-bottom: 8px;
@@ -271,7 +290,7 @@ export default class DeliveryDetail extends Vue {
       width: 100%;
       display: flex;
       align-items: center;
-      padding-bottom: 8px;
+      padding-bottom: 16px;
       .s-col{
         width: 100%;
         font-size: 14px;

src/views/oms/order/components/orderTable.vue

@@ -65,13 +65,13 @@
         {{ getFromText(row.sourceFrom) }}
       </template>
     </vxe-column>
-    <vxe-column field="shipment" title="跨境买家指定物流" width="120"></vxe-column>
+    <!-- <vxe-column field="shipment" title="跨境买家指定物流" width="120"></vxe-column> -->
     <vxe-column field="chosenChannel" title="实发快递渠道" width="120"></vxe-column>
     <vxe-column field="logisticsId" title="快递单号" width="120"></vxe-column>
     <vxe-column field="logisticsCompany" title="快递公司" width="120"></vxe-column>
     <vxe-column field="logisticsCompanyId" title="物流公司编码" width="120"></vxe-column>
-    <vxe-column field="internationalLogisticsId" title="国际物流单号" width="120"></vxe-column>
-    <vxe-column field="skus" title="skus" width="120"></vxe-column>
+    <!-- <vxe-column field="internationalLogisticsId" title="国际物流单号" width="120"></vxe-column> -->
+    <!-- <vxe-column field="skus" title="skus" width="120"></vxe-column> -->
     <vxe-column field="weight" title="重量" width="70"></vxe-column>
     <vxe-column field="isCod" title="是否货到付款" width="120">
       <template #default="{ row }">
@@ -79,13 +79,13 @@
       </template>
     </vxe-column>
     <vxe-column field="sendDate" title="发货日期" width="120"></vxe-column>
-    <vxe-column field="signTime" title="预计送达时间" width="120"></vxe-column>
-    <vxe-column field="endTime" title="确认收货时间" width="120"></vxe-column>
+    <!-- <vxe-column field="signTime" title="预计送达时间" width="120"></vxe-column>
+    <vxe-column field="endTime" title="确认收货时间" width="120"></vxe-column> -->
     <vxe-column field="receiverAddress" title="收货地址" show-overflow width="160"></vxe-column>
     <vxe-column field="receiverName" title="收件人" show-overflow width="120"></vxe-column>
     <vxe-column field="receiverMobile" title="手机" show-overflow width="120"></vxe-column>
     <vxe-column field="buyerMessage" title="买家留言" show-overflow width="120"></vxe-column>
-    <vxe-column field="wmsCoId" title="发货仓编号" width="120"></vxe-column>
+    <!-- <vxe-column field="wmsCoId" title="发货仓编号" width="120"></vxe-column> -->
     <vxe-column field="payDate" title="支付时间" width="140"></vxe-column>
     <vxe-column field="freeAmount" title="抵扣金额" align="right" width="120"></vxe-column>
     <vxe-column field="payAmount" title="应付+运费" align="right" width="120">
@@ -96,7 +96,7 @@
     </vxe-column>
     <vxe-column field="paidAmount" title="实付金额" align="right" width="120"></vxe-column>
     <vxe-column field="shopBuyerId" title="买家昵称" show-overflow width="140"></vxe-column>
-    <vxe-column field="openId" title="平台买家唯一值" show-overflow width="140"></vxe-column>
+    <!-- <vxe-column field="openId" title="平台买家唯一值" show-overflow width="140"></vxe-column> -->
     <vxe-column field="buyerPaidAmount" title="总买家实付" width="120"></vxe-column>
     <vxe-column field="sellerIncomeAmount" title="总卖家实收" width="120"></vxe-column>
     <vxe-column field="questionType" title="问题类型" width="120"></vxe-column>
@@ -111,8 +111,8 @@
       </template>
     </vxe-column>
     <!-- <vxe-column field="buyerTaxNo" title="发票税号" width="120"></vxe-column> -->
-    <vxe-column field="drpCoIdFrom" title="分销商编号" width="120"></vxe-column>
-    <vxe-column field="drpCoIdTo" title="供销商编号" width="120"></vxe-column>
+    <!-- <vxe-column field="drpCoIdFrom" title="分销商编号" width="120"></vxe-column>
+    <vxe-column field="drpCoIdTo" title="供销商编号" width="120"></vxe-column> -->
     <vxe-column field="orderDate" title="订单日期" width="120">
       <template #default="{ row }">
         {{ formatDate(row.orderDate) }}

src/views/oms/order/index.vue

@@ -1026,8 +1026,8 @@ export default class Order extends Vue {
   //订单详情
   detail(row:any){
     let data = (this as any).$lodash.cloneDeep(row);
-    (this.$refs.addOrder as any).setShow(true);
     (this.$refs.addOrder as any).setDetail(data); 
+    (this.$refs.addOrder as any).setShow(true);
   }
 
   handleSizeChange(v:number){