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

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

@@ -249,8 +249,9 @@ export default class BatchbyOneModal extends Vue {
           skuIds.push(item.omsOrderItemId);
           params.tmsMaterials.push({
             qty:i.tmsQuantity,
-            storeHouseId:item.storeHouseId,
-            materialSkuId:i.omsOrderItemId
+            materialSkuId:i.omsOrderItemId,
+            storeHouseId:item.out_storeHouseId,
+            storingLocationId:item.entry_storeHouseId
           })
         }else{
           for(let paramsItem of params.tmsMaterials){
@@ -343,7 +344,7 @@ export default class BatchbyOneModal extends Vue {
       for(const i of data.subItem){
         params.materialInfos.push({
           skuId: i.omsOrderItemId,
-          qty:i.tmsQuantity
+          qty:i.tmsQuantity,
         })
       }
     }

src/views/audit/store/index.vue

@@ -64,7 +64,7 @@
 					search: true,
 				},
 				customTools:[{
-					name:'短驳',
+					name:'短驳调拨',
 					icon:'el-icon-discount',
 					event:{
 						click: () => {