工位上货问题

src/views/collect/CollectOrderTabs.vue

@@ -87,8 +87,6 @@
   </el-row>
 
 
-
-
 </template>
 
 <script>
@@ -102,7 +100,12 @@ import ioSplitFifoCodeBlank from "@/views/collect/ioSplitFifoCodeBlank.vue";
 
 export default {
   components: {
-    DealOrderBlank,IoCreateOrderBlankReturn,IoCreateOrderBlankOut,ioSplitFifoCodeBlank,CollectOrderAllotBlank,CollectOrderEndBlank
+    DealOrderBlank,
+    IoCreateOrderBlankReturn,
+    IoCreateOrderBlankOut,
+    ioSplitFifoCodeBlank,
+    CollectOrderAllotBlank,
+    CollectOrderEndBlank
   },
   name: 'CollectOrderTabs',
   data() {
@@ -127,7 +130,7 @@ export default {
           component: IoCreateOrderBlankOut,
           // 假设你需要传递的参数
           componentProps: {
-          splitType: 'out'
+            fromSplitType: 'out'
           }
         },
         {
@@ -137,7 +140,7 @@ export default {
           component: IoCreateOrderBlankReturn,
           // 假设你需要传递的参数
           componentProps: {
-          splitType: 'return'
+            fromSplitType: 'return'
           }
         },
         {
@@ -146,9 +149,7 @@ export default {
           name: 'ioSplitFifoCodeBlank',
           component: ioSplitFifoCodeBlank,
           // 假设你需要传递的参数
-        componentProps: {
+          componentProps: {}
-
-        }
         },
         {
           number: 4,
@@ -156,9 +157,7 @@ export default {
           name: 'CollectOrderAllotBlank',
           component: CollectOrderAllotBlank,
           // 假设你需要传递的参数
-        componentProps: {
+          componentProps: {}
-
-        }
         },
         {
           number: 5,
@@ -166,9 +165,7 @@ export default {
           name: 'CollectOrderEndBlank',
           component: CollectOrderEndBlank,
           // 假设你需要传递的参数
-        componentProps: {
+          componentProps: {}
-
-        }
         }],
       editableTabs: [{
         number: 0,

src/views/collect/IoCreateOrder.vue

@@ -362,7 +362,7 @@ export default {
       type: Object,
       required: true,
     },
-    splitType: {//splitType
+    fromSplitType: {//splitType
       type: Object,
       required: true,
     },
@@ -559,7 +559,7 @@ export default {
       this.$refs.inputRef.focus();
     },
     successCloseData() {
-      let workPlaceCode = this.orderFormData.workPlaceCode
+      let tempData = JSON.parse(JSON.stringify(this.orderFormData));
       this.orderFormData = {
         billNo: null,
         corpOrderId: null,
@@ -583,19 +583,18 @@ export default {
         fifoSplit: 1,
 
       }
-      this.orderFormData.workPlaceCode = workPlaceCode
+      this.orderFormData.workPlaceCode = tempData.workPlaceCode
+      this.orderFormData.mainAction = tempData.mainAction
+      this.orderFormData.action = tempData.action
+      this.orderFormData.fromCorp = tempData.fromCorp
+      this.orderFormData.fromDeptCode = tempData.fromDeptCode
+      this.orderFormData.fromInvCode = tempData.fromInvCode
+      this.orderFormData.fromInvCode = tempData.fromInvCode
+      this.orderFormData.deptCode = tempData.deptCode
+      this.orderFormData.invCode = tempData.invCode
       this.scanCode = "";
       this.corpOrderIdDisabled = false;
 
-
-      this.splitType = this.splitType;
-      if (this.splitType == "search") {
-      } else if (this.splitType == "out") {
-        this.orderFormData.action = 'SC72197936495755';
-      } else if (this.splitType == "return") {
-        this.orderFormData.action = 'SC72249388338364';
-      }
-      this.orderFormData.fromCorp = "72198012799726";
       this.refreshCodesPanel()
     },
     //获取用户仓库列表
@@ -1761,6 +1760,7 @@ export default {
 
     init() {
       //页面初始化
+
       this.codeFormData.code = "";
       if (this.splitType == "search") {
       } else if (this.splitType == "out") {
@@ -1835,7 +1835,9 @@ export default {
     inputer.focus();
   },
   created() {
-    this.splitType = this.splitType;
+    this.splitType = this.$route.query.splitType;
+    if (this.splitType == null)
+      this.splitType = this.fromSplitType
     this.init();
     if (this.$route.query.workplaceId != null) {
       this.corpOrderIdDisabled = true

src/views/collect/IoCreateOrderBlank.vue

@@ -362,7 +362,7 @@ export default {
       type: Object,
       required: true,
     },
-    splitType: {//splitType
+    fromSplitType: {//splitType
       type: Object,
       required: true,
     },
@@ -559,7 +559,7 @@ export default {
       this.$refs.inputRef.focus();
     },
     successCloseData() {
-      let workPlaceCode = this.orderFormData.workPlaceCode
+      let tempData = JSON.parse(JSON.stringify(this.orderFormData));
       this.orderFormData = {
         billNo: null,
         corpOrderId: null,
@@ -583,19 +583,18 @@ export default {
         fifoSplit: 1,
 
       }
-      this.orderFormData.workPlaceCode = workPlaceCode
+      this.orderFormData.workPlaceCode = tempData.workPlaceCode
+      this.orderFormData.mainAction = tempData.mainAction
+      this.orderFormData.action = tempData.action
+      this.orderFormData.fromCorp = tempData.fromCorp
+      this.orderFormData.fromDeptCode = tempData.fromDeptCode
+      this.orderFormData.fromInvCode = tempData.fromInvCode
+      this.orderFormData.fromInvCode = tempData.fromInvCode
+      this.orderFormData.deptCode = tempData.deptCode
+      this.orderFormData.invCode = tempData.invCode
       this.scanCode = "";
       this.corpOrderIdDisabled = false;
 
-
-      this.splitType = this.splitType;
-      if (this.splitType == "search") {
-      } else if (this.splitType == "out") {
-        this.orderFormData.action = 'SC72197936495755';
-      } else if (this.splitType == "return") {
-        this.orderFormData.action = 'SC72249388338364';
-      }
-      this.orderFormData.fromCorp = "72198012799726";
       this.refreshCodesPanel()
     },
     //获取用户仓库列表
@@ -610,7 +609,7 @@ export default {
             this.orderFormData.invWarehouseCode == null
           ) {
             //this.orderFormData.invCode = this.curInvOptions[0].code;
-            // this.getBusTypeByInv();
+            this.getBusTypeByInv();
             this.findCurSpaceList(this.orderFormData.invCode);
             this.findCurWorkPlaces();
           }
@@ -1761,6 +1760,7 @@ export default {
 
     init() {
       //页面初始化
+
       this.codeFormData.code = "";
       if (this.splitType == "search") {
       } else if (this.splitType == "out") {
@@ -1835,7 +1835,9 @@ export default {
     inputer.focus();
   },
   created() {
-    this.splitType = this.splitType;
+    this.splitType = this.$route.query.splitType;
+    if (this.splitType == null)
+      this.splitType = this.fromSplitType
     this.init();
     if (this.$route.query.workplaceId != null) {
       this.corpOrderIdDisabled = true