1

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

@@ -239,12 +239,12 @@ export default class BatchbyOneModal extends Vue {
       return
     }
     let params:any={};
-    params.storeHouseId = item.storeHouse;
-    params.skuIds=[]
+    params.storeHouseId = item.storeHouseId;
+    params.skuIds=[];
     if(item.subItem){
       for(const i of item.subItem){
         if(params.skuIds.indexOf(i.omsOrderItemId) == -1){
-          params.skuIds.push(i.omsOrderItemId)
+          params.skuIds.push(i.omsOrderItemId);
         }
       }
     }
@@ -292,6 +292,22 @@ export default class BatchbyOneModal extends Vue {
       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){
+          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;
@@ -352,7 +368,7 @@ export default class BatchbyOneModal extends Vue {
     for(const item of this.data){
       if(ids.indexOf(item.omsOrderIds) > -1 && !item.isSuccess){
         item.orderType = _value.orderType;
-        item.storeHouse = _value.storeHouse;
+        item.storeHouseId = _value.storeHouseId;
         item.tmsArrivalDate = _value.tmsArrivalDate;
         item.tmsDeliveryDate =_value.tmsDeliveryDate;
         item.tmsTransportMethod = _value.tmsTransportMethod;

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

@@ -154,6 +154,21 @@ export default class carpoolModal extends Vue {
     for(const item of this.data){
       params.omsOrderIds.push(item.id);
     }
+    params.tmsMaterials=[];
+    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
+          })
+        }
+        
+      }
+    }
+    delete params.subItem;
     this.load = true;
     addMultipleToOne(params).then((res:any) => {
       this.load = false;
@@ -172,7 +187,7 @@ export default class carpoolModal extends Vue {
   //查库存
   getStoreCount(item:any,callback?:Function){
     let params:any={};
-    params.storeHouseId = item.storeHouse;
+    params.storeHouseId = item.storeHouseId;
     params.skuIds=[]
     if(item.subItem){
       for(const i of item.subItem){

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

@@ -152,7 +152,7 @@
         </vxe-table>
       </div>
     </div>
-    <vxe-modal v-model="showModal" id="deliverInfoEdit" width="900" height="80%" @show="show" @hide="hide" title="编辑"  transfer show-footer>
+    <vxe-modal v-model="showModal" id="deliverInfoEdit" width="900" height="80%" @show="show" @hide="hide" title="编辑" resize show-zoom transfer show-footer>
       <by-form :propConfig="config" ref="form" />
       <template #footer>
         <div class="btn">
@@ -397,7 +397,7 @@ export default class DeliveryGoodsInfo extends Vue {
       }],
       [{
         label:'仓库',
-        prop:'storeHouse',
+        prop:'storeHouseId',
         component:'warehouse',
         compConfig:{
           attr:{