订单bug修改

src/components/skuModal/productModal.vue

@@ -46,26 +46,26 @@ export default class ProductModal extends Vue {
       columns:[
         [{
           span:10,
-          label:'物料ID',
-          prop:'materialId',
+          label:'物料编号',
+          prop:'skuid',
           component:'by-input',
           labelWidth:'120px',
           compConfig:{
             attr:{
               clearable:true,
-              placeholder:'请输入物料ID'
+              placeholder:'请输入物料编号'
             }
           }
         },{
           span:10,
           label:'商品名称',
-          prop:'skuTitle',
+          prop:'name',
           component:'by-input',
           labelWidth:'120px',
           compConfig:{
             attr:{
               clearable:true,
-              placeholder:'请输入标题'
+              placeholder:'请输入商品名称'
             }
           }
         }]
@@ -175,7 +175,7 @@ export default class ProductModal extends Vue {
       return
     }
     let query:any = (this.$refs.view as any).getQuery();
-    query.isLikeSearch = '1';
+    query.isLikeSearch = '0';
     this.load = true;
     (this as any).$request({
       url: '/maindata/maindataMaterialSku/page',

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

@@ -1068,7 +1068,6 @@ 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;

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

@@ -222,7 +222,7 @@ export default class BatchbyOneModal extends Vue {
       return
     }
     const _value = this.data[this.currentOrder];
-    if(!_value.tmsShipmentAddress || !_value.tmsShipmentConsignor || !_value.tmsUnloadingAddress || !_value.tmsUnloadingConsignor){
+    if(!_value.tmsBusinessMan || !_value.tmsBusinessPhone || !_value.tmsShipmentConsignor || !_value.tmsShipmentContacts || !_value.tmsUnloadingConsignor || !_value.tmsUnloadingContacts || !_value.tmsUnloadingProvince || !_value.tmsUnloadingAddress || !_value.storeHouseId){
       this.$message("请编辑订单信息");
       return
     }
@@ -407,7 +407,8 @@ export default class BatchbyOneModal extends Vue {
   //获取价格
   getPriceInfo(data:any,callback?:Function){
     let params:any={};
-    params.startAddressCode = data.tmsShipmentCityNo + '00000';
+    params.startStoreHouseId = data.storeHouseId;
+    // params.startAddressCode = data.tmsShipmentCityNo + '00000';
     params.endAddressCode = data.tmsUnloadingCityNo + '00000';
     params.omsIds=[this.data[0].omsOrderIds];
     params.planType = data.tmsTransportMethod;

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

@@ -107,7 +107,8 @@ export default class CarpoolModal extends Vue {
   }
   getPriceInfo(data:any){
     let params:any={};
-    params.startAddressCode = data.tmsShipmentCityNo + '00000';
+    params.startStoreHouseId = data.storeHouseId;
+    // params.startAddressCode = data.tmsShipmentCityNo + '00000';
     params.endAddressCode = data.tmsUnloadingCityNo + '00000';
     params.planType = data.tmsTransportMethod;
     params.omsIds=[];
@@ -141,7 +142,7 @@ export default class CarpoolModal extends Vue {
       this.$message('请阅读并同意运单协议！')
       return
     }
-    if(!this.value.tmsShipmentAddress || !this.value.tmsShipmentConsignor || !this.value.tmsUnloadingAddress || !this.value.tmsUnloadingConsignor){
+    if(!this.value.tmsBusinessMan || !this.value.tmsBusinessPhone || !this.value.tmsShipmentConsignor || !this.value.tmsShipmentContacts || !this.value.tmsUnloadingConsignor || !this.value.tmsUnloadingContacts || !this.value.tmsUnloadingProvince || !this.value.tmsUnloadingAddress || !this.value.storeHouseId){
       this.$message("请编辑订单信息");
       return
     }