Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

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

@@ -318,8 +318,8 @@ export default class BatchbyOneModal extends Vue {
   //获取价格
   getPriceInfo(data:any,callback?:Function){
     let params:any={};
-    params.startAddressCode = data.tmsShipmentCityNo + '000';
-    params.endAddressCode = data.tmsUnloadingCityNo + '000';
+    params.startAddressCode = data.tmsShipmentCityNo + '00000';
+    params.endAddressCode = data.tmsUnloadingCityNo + '00000';
     params.materialInfos = []
     if(data.subItem){
       for(const i of data.subItem){

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

@@ -239,25 +239,6 @@ export default class DeliveryGoodsInfo extends Vue {
       }
     },
     columns:[
-      // [
-      //   {
-      //   label:'订单类型',
-      //   prop:'orderType',
-      //   component:'by-select',
-      //   compConfig:{
-      //     attr:{
-      //       data: [{
-      //         label:'B2C',
-      //         value:'B2C'
-      //       },{
-      //         label:'B2B',
-      //         value:'B2B'
-      //       }],
-      //       clearable:true
-      //     }
-      //   }
-      // }
-      // ],
       [{
         label:'业务员',
         prop:'tmsBusinessMan',
@@ -277,6 +258,48 @@ export default class DeliveryGoodsInfo extends Vue {
           }
         }
       }],
+      [{
+        label:'仓库',
+        prop:'storeHouseId',
+        component:'warehouse',
+        compConfig:{
+          attr:{
+            placeholder:'请选择仓库',
+            clearable:true,
+            retConfig:{
+              tmsShipmentProvince: 'province',
+              tmsShipmentProvinceNo:'provinceCode',
+              tmsShipmentCity: 'city',
+              tmsShipmentCityNo: 'cityCode',
+              tmsShipmentRegion: 'region',
+              tmsShipmentRegionNo: 'regionCode',
+              tmsShipmentStreetNo: 'streetCode',
+              tmsShipmentStreet: 'street',
+              storeHouseId: 'id'
+            }
+          }
+        }
+      },{
+        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',
@@ -310,7 +333,10 @@ export default class DeliveryGoodsInfo extends Vue {
             county:'tmsShipmentRegion',  //县/区
             countyCode:'tmsShipmentRegionNo',   //县/区编码
             townCode:'tmsShipmentStreetNo',
-            town:'tmsShipmentStreet'
+            town:'tmsShipmentStreet',
+            broadcastConfig:{
+              name: 'warehouseChange'
+            }
           }
         }
       }],
@@ -392,37 +418,7 @@ export default class DeliveryGoodsInfo extends Vue {
           }
         }
       }],
-      [{
-        label:'仓库',
-        prop:'storeHouseId',
-        component:'warehouse',
-        compConfig:{
-          attr:{
-            placeholder:'请选择仓库',
-            clearable:true
-          }
-        }
-      },{
-        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:'tmsRemark',

src/views/oms/cargoOwner/index.vue

@@ -100,7 +100,7 @@ export default class CargoOwner extends Vue {
               return row.wmsEnableStatus === 1
             },
             click:(item:any) => {
-              this.disableData(item);
+              this.isableData(item,false);
             }
           }
         },{
@@ -110,7 +110,7 @@ export default class CargoOwner extends Vue {
               return row.wmsEnableStatus !== 1
             },
             click:(item:any) => {
-              this.ableData(item);
+              this.isableData(item,true);
             }
           }
         }]
@@ -262,14 +262,11 @@ export default class CargoOwner extends Vue {
       callback();
     }
   }
-  //启用
-  ableData(item:any) {
-    
-  }
-  //禁用
-  disableData(item:any) {
+
+  //禁用--启用
+  isableData(item:any,enableStatus?:boolean) {
     this.load = true;
-    disableMember({id: item.id}).then((res:any) => {
+    disableMember({id: item.id,enableStatus:enableStatus}).then((res:any) => {
       this.$message({
         message:res.msg,
         type:'success'

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

@@ -104,6 +104,7 @@ export default class BatchbyOneModal extends Vue {
       for(const item of data){
         const requestId =  new Date().getTime() + this.getUuid()
         let obj:any={
+          tmsTransportMethod:'零担',
           tmsBusinessMan: (this as any).$store.getters.userInfo.userName,
           tmsBusinessPhone: (this as any).$store.getters.userInfo.phonenumber,
           requestId:requestId,
@@ -404,8 +405,8 @@ export default class BatchbyOneModal extends Vue {
   //获取价格
   getPriceInfo(data:any,callback?:Function){
     let params:any={};
-    params.startAddressCode = data.tmsShipmentCityNo + '000';
-    params.endAddressCode = data.tmsUnloadingCityNo + '000';
+    params.startAddressCode = data.tmsShipmentCityNo + '00000';
+    params.endAddressCode = data.tmsUnloadingCityNo + '00000';
     params.omsIds=[this.data[0].omsOrderIds];
     params.planType = data.tmsTransportMethod;
     this.load = true;

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

@@ -64,6 +64,7 @@ export default class CarpoolModal extends Vue {
   setValue(data:Array<any>){
     this.data =data;
     this.value={};
+    this.value.tmsTransportMethod = '整车';
     this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.userName;
     this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
     this.value.subItem=[];
@@ -106,8 +107,8 @@ export default class CarpoolModal extends Vue {
   }
   getPriceInfo(data:any){
     let params:any={};
-    params.startAddressCode = data.tmsShipmentCityNo + '000';
-    params.endAddressCode = data.tmsUnloadingCityNo + '000';
+    params.startAddressCode = data.tmsShipmentCityNo + '00000';
+    params.endAddressCode = data.tmsUnloadingCityNo + '00000';
     params.planType = data.tmsTransportMethod;
     params.omsIds=[];
     for(const item of this.data){

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

@@ -229,9 +229,9 @@ export default class DeliveryGoodsInfo extends Vue {
         tmsDeliveryDate:[{
           required: true, message: '期望提货时间不能为空！', trigger: 'blur'
         }],
-        tmsTransportMethod: [{
-          required: true, message: '运输方式不能为空！', trigger: 'change'
-        }],
+        // tmsTransportMethod: [{
+        //   required: true, message: '运输方式不能为空！', trigger: 'change'
+        // }],
         wmsSendType: [{
           required: true, message: '出库方式不能为空！', trigger: 'change'
         }]
@@ -298,25 +298,47 @@ export default class DeliveryGoodsInfo extends Vue {
           }
         }
       },{
-        label:'运输方式',
-        prop:'tmsTransportMethod',
+        span:12,
+        label:'出库方式',
+        prop:'wmsSendType',
         component:'by-select',
         compConfig:{
           attr:{
             clearable:true,
             data: [{
-              label:'整车',
-              value:'整车'
+              label:'越库出库',
+              value:'YKCK'
             },{
-              label:'零担',
-              value:'零担'
+              label:'B2B出库',
+              value:'B2BCK'
             },{
-              label:'短驳',
-              value:'短驳'
+              label:'B2C出库',
+              value:'B2CCK'
             }]
           }
         }
-      }],
+      }
+      // ,{
+      //   label:'运输方式',
+      //   prop:'tmsTransportMethod',
+      //   component:'by-select',
+      //   compConfig:{
+      //     attr:{
+      //       clearable:true,
+      //       data: [{
+      //         label:'整车',
+      //         value:'整车'
+      //       },{
+      //         label:'零担',
+      //         value:'零担'
+      //       },{
+      //         label:'短驳',
+      //         value:'短驳'
+      //       }]
+      //     }
+      //   }
+      // }
+      ],
       [{
         label:'发货人',
         prop:'tmsShipmentConsignor',
@@ -441,26 +463,6 @@ export default class DeliveryGoodsInfo extends Vue {
         }
       }],
       [{
-        span:12,
-        label:'出库方式',
-        prop:'wmsSendType',
-        component:'by-select',
-        compConfig:{
-          attr:{
-            clearable:true,
-            data: [{
-              label:'越库出库',
-              value:'YKCK'
-            },{
-              label:'B2B出库',
-              value:'B2BCK'
-            },{
-              label:'B2C出库',
-              value:'B2CCK'
-            }]
-          }
-        }
-      },{
         label:'备注',
         prop:'tmsRemark',
         component:'by-input',

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

@@ -8,7 +8,7 @@
         <el-radio-group v-model="type">
           <el-radio :label="1">按线上订单号</el-radio>
           <el-radio :label="2">按时间段</el-radio>
-          <el-radio :label="3">按订单状态</el-radio>
+          <!-- <el-radio :label="3">按订单状态</el-radio> -->
         </el-radio-group>
       </div>
       <div class="cont">
@@ -33,6 +33,19 @@
         </div>
       </template>
       <template v-if="type == 2">
+        <div class="cont">
+          <div class="title"><span>* </span>订单状态：</div>
+          <div class="right-cont">
+            <el-select v-model="status" size="mini" style="width:100%" placeholder="请选择" clearable>
+              <el-option
+                v-for="item in statusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
         <div class="cont">
           <div class="title"><span>* </span>时间类型：</div>
           <div class="right-cont">
@@ -64,7 +77,7 @@
           </div>
         </div>
       </template>
-      <template v-if="type == 3">
+      <!-- <template v-if="type == 3">
         <div class="cont">
           <div class="title"><span>* </span>订单状态：</div>
           <div class="right-cont">
@@ -78,7 +91,7 @@
             </el-select>
           </div>
         </div>
-      </template>
+      </template> -->
     </template>
     <template #footer>
       <div class="btn">
@@ -201,6 +214,14 @@ export default class LoadOrderModal extends Vue {
           break
         }
       }
+      if(!this.status){
+        if(msg){
+          msg = msg + '，订单状态'
+        }else{
+          msg = '订单状态'
+        }
+      }
+      value.status = this.status;
       // if(Number(this.dateType) > 5 || Number(this.dateType) < 1){
       if(!isS){
         if(msg){
@@ -219,16 +240,17 @@ export default class LoadOrderModal extends Vue {
       value.dateType = Number(this.dateType) - 1;
       value.beginDate = this.beginDate;
       value.endDate = this.endDate;
-    }else if(this.type == 3){
-      if(!this.status){
-        if(msg){
-          msg = msg + '，订单状态'
-        }else{
-          msg = '订单状态'
-        }
-      }
-      value.status = this.status;
     }
+    // else if(this.type == 3){
+    //   if(!this.status){
+    //     if(msg){
+    //       msg = msg + '，订单状态'
+    //     }else{
+    //       msg = '订单状态'
+    //     }
+    //   }
+    //   value.status = this.status;
+    // }
     if(msg){
       this.$message({
         message:msg + '不能为空！',

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

@@ -44,7 +44,7 @@ export default class PurchaseModel extends Vue {
       size:'small',
       rules:{
         organizationName:[{
-          required: true, message: '供应商不能为空！', trigger: 'blur'
+          required: true, message: '供应商不能为空！', trigger: ['blur','change']
         }],
         deliveryAddress:[{
           required: true, message: '交货地点不能为空！', trigger: 'blur'