From 2e40ee4406b403ac780a2f4802d1e3aa2a45f9c3 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 26 Aug 2024 20:04:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderTabs.vue   | 213 +++++++++++------------
 src/views/collect/IoCreateOrder.vue      |  28 +--
 src/views/collect/IoCreateOrderBlank.vue |  30 ++--
 3 files changed, 136 insertions(+), 135 deletions(-)

diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index d1de5bfa..a9e0a4c4 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row class="tac">
     <el-col :span="2">
-<!--      <h5>默认颜色</h5>-->
+      <!--      <h5>默认颜色</h5>-->
       <el-menu
         :default-active="menuActive"
         class="el-menu-vertical-demo"
@@ -42,53 +42,51 @@
           :name="item.name"
 
         >
-          <component :is="item.component" v-bind="item.componentProps" />
+          <component :is="item.component" v-bind="item.componentProps"/>
         </el-tab-pane>
       </el-tabs>
 
 
-<!--      <el-tabs :tab-position="tabPosition" style="height: 100%">-->
-<!--        <el-tab-pane label="处理单据" style="height: 100%"  @click="addTab('DealOrderBlank')">-->
-<!--          <DealOrderBlank>-->
-<!--          </DealOrderBlank>-->
-<!--        </el-tab-pane>-->
-
-<!--        <el-tab-pane label="工位上货"style="height: 100%"  @click="addTab('IoCreateOrderBlankReturn')">-->
-<!--          <IoCreateOrderBlankReturn-->
-<!--            :splitType="'return'"-->
-<!--          >-->
-<!--          </IoCreateOrderBlankReturn>-->
-<!--        </el-tab-pane>-->
-
-<!--        <el-tab-pane label="工位退货" style="height: 100%"  @click="addTab('IoCreateOrderBlankOut')">-->
-<!--          <IoCreateOrderBlankOut-->
-<!--            :splitType="'out'"-->
-<!--          >-->
-<!--          </IoCreateOrderBlankOut>-->
-<!--        </el-tab-pane>-->
-
-<!--        <el-tab-pane label="工位存量" style="height: 100%"  @click="addTab('ioSplitFifoCodeBlank')">-->
-<!--          <ioSplitFifoCodeBlank>-->
-<!--          </ioSplitFifoCodeBlank>-->
-<!--        </el-tab-pane>-->
-
-<!--        <el-tab-pane label="待处理单" style="height: 100%"  @click="addTab('CollectOrderAllotBlank')">-->
-<!--          <CollectOrderAllotBlank>-->
-<!--          </CollectOrderAllotBlank>-->
-<!--        </el-tab-pane>-->
-
-<!--        <el-tab-pane label="已完成单" style="height: 100%"  @click="addTab('CollectOrderEndBlank')">-->
-<!--          <CollectOrderEndBlank>-->
-<!--          </CollectOrderEndBlank>-->
-<!--        </el-tab-pane>-->
-
-<!--      </el-tabs>-->
+      <!--      <el-tabs :tab-position="tabPosition" style="height: 100%">-->
+      <!--        <el-tab-pane label="处理单据" style="height: 100%"  @click="addTab('DealOrderBlank')">-->
+      <!--          <DealOrderBlank>-->
+      <!--          </DealOrderBlank>-->
+      <!--        </el-tab-pane>-->
+
+      <!--        <el-tab-pane label="工位上货"style="height: 100%"  @click="addTab('IoCreateOrderBlankReturn')">-->
+      <!--          <IoCreateOrderBlankReturn-->
+      <!--            :splitType="'return'"-->
+      <!--          >-->
+      <!--          </IoCreateOrderBlankReturn>-->
+      <!--        </el-tab-pane>-->
+
+      <!--        <el-tab-pane label="工位退货" style="height: 100%"  @click="addTab('IoCreateOrderBlankOut')">-->
+      <!--          <IoCreateOrderBlankOut-->
+      <!--            :splitType="'out'"-->
+      <!--          >-->
+      <!--          </IoCreateOrderBlankOut>-->
+      <!--        </el-tab-pane>-->
+
+      <!--        <el-tab-pane label="工位存量" style="height: 100%"  @click="addTab('ioSplitFifoCodeBlank')">-->
+      <!--          <ioSplitFifoCodeBlank>-->
+      <!--          </ioSplitFifoCodeBlank>-->
+      <!--        </el-tab-pane>-->
+
+      <!--        <el-tab-pane label="待处理单" style="height: 100%"  @click="addTab('CollectOrderAllotBlank')">-->
+      <!--          <CollectOrderAllotBlank>-->
+      <!--          </CollectOrderAllotBlank>-->
+      <!--        </el-tab-pane>-->
+
+      <!--        <el-tab-pane label="已完成单" style="height: 100%"  @click="addTab('CollectOrderEndBlank')">-->
+      <!--          <CollectOrderEndBlank>-->
+      <!--          </CollectOrderEndBlank>-->
+      <!--        </el-tab-pane>-->
+
+      <!--      </el-tabs>-->
     </el-col>
   </el-row>
 
 
-
-
 </template>
 
 <script>
@@ -101,8 +99,13 @@ import ioSplitFifoCodeBlank from "@/views/collect/ioSplitFifoCodeBlank.vue";
 
 
 export default {
-  components:{
-    DealOrderBlank,IoCreateOrderBlankReturn,IoCreateOrderBlankOut,ioSplitFifoCodeBlank,CollectOrderAllotBlank,CollectOrderEndBlank
+  components: {
+    DealOrderBlank,
+    IoCreateOrderBlankReturn,
+    IoCreateOrderBlankOut,
+    ioSplitFifoCodeBlank,
+    CollectOrderAllotBlank,
+    CollectOrderEndBlank
   },
   name: 'CollectOrderTabs',
   data() {
@@ -110,66 +113,60 @@ export default {
       tabPosition: 'left',
       editableTabsValue: 'DealOrderBlank',
       componentTables: [
-      {
-        number: 0,
-        title: '处理单据',
-        name: 'DealOrderBlank',
-        component: DealOrderBlank,
-        // 假设你需要传递的参数
-        componentProps: {
-          title: '这是单据的标题'
-        }
-      },
-      {
-        number: 1,
-        title: '工位上货',
-        name: 'IoCreateOrderBlankOut',
-        component: IoCreateOrderBlankOut,
-        // 假设你需要传递的参数
-        componentProps: {
-          splitType: 'out'
-        }
-      },
-      {
-        number: 2,
-        title: '工位退货',
-        name: 'IoCreateOrderBlankReturn',
-        component: IoCreateOrderBlankReturn,
-        // 假设你需要传递的参数
-        componentProps: {
-          splitType: 'return'
-        }
-      },
-      {
-        number: 3,
-        title: '工位存量',
-        name: 'ioSplitFifoCodeBlank',
-        component: ioSplitFifoCodeBlank,
-        // 假设你需要传递的参数
-        componentProps: {
-
-        }
-      },
-      {
-        number: 4,
-        title: '待处理单',
-        name: 'CollectOrderAllotBlank',
-        component: CollectOrderAllotBlank,
-        // 假设你需要传递的参数
-        componentProps: {
-
-        }
-      },
-      {
-        number: 5,
-        title: '已完成单',
-        name: 'CollectOrderEndBlank',
-        component: CollectOrderEndBlank,
-        // 假设你需要传递的参数
-        componentProps: {
-
-        }
-      }],
+        {
+          number: 0,
+          title: '处理单据',
+          name: 'DealOrderBlank',
+          component: DealOrderBlank,
+          // 假设你需要传递的参数
+          componentProps: {
+            title: '这是单据的标题'
+          }
+        },
+        {
+          number: 1,
+          title: '工位上货',
+          name: 'IoCreateOrderBlankOut',
+          component: IoCreateOrderBlankOut,
+          // 假设你需要传递的参数
+          componentProps: {
+            fromSplitType: 'out'
+          }
+        },
+        {
+          number: 2,
+          title: '工位退货',
+          name: 'IoCreateOrderBlankReturn',
+          component: IoCreateOrderBlankReturn,
+          // 假设你需要传递的参数
+          componentProps: {
+            fromSplitType: 'return'
+          }
+        },
+        {
+          number: 3,
+          title: '工位存量',
+          name: 'ioSplitFifoCodeBlank',
+          component: ioSplitFifoCodeBlank,
+          // 假设你需要传递的参数
+          componentProps: {}
+        },
+        {
+          number: 4,
+          title: '待处理单',
+          name: 'CollectOrderAllotBlank',
+          component: CollectOrderAllotBlank,
+          // 假设你需要传递的参数
+          componentProps: {}
+        },
+        {
+          number: 5,
+          title: '已完成单',
+          name: 'CollectOrderEndBlank',
+          component: CollectOrderEndBlank,
+          // 假设你需要传递的参数
+          componentProps: {}
+        }],
       editableTabs: [{
         number: 0,
         title: '处理单据',
@@ -184,16 +181,16 @@ export default {
       tabIndex: 0,
       menuActive: 0
     }
-    },
+  },
   methods: {
-    upodateMenuActive(tab, event){
+    upodateMenuActive(tab, event) {
       const foundTab = this.findTabByName(tab.name);
       if (foundTab) {
         // 如果找到了，执行一些操作
         this.menuActive = foundTab.number;
       }
     },
-    clickMenuItem(val){
+    clickMenuItem(val) {
       //分两种 一种已存在 一种未存在
       let item = this.componentTables[(val)]
 
@@ -203,7 +200,7 @@ export default {
         this.editableTabsValue = foundTab.name;
       } else {
         // 如果没有找到，执行其他操作
-          this.addTab(item)
+        this.addTab(item)
       }
 
     },
@@ -214,7 +211,7 @@ export default {
       return tab;
     },
     addTab(item) {
-       ++this.tabIndex;
+      ++this.tabIndex;
       this.editableTabs.push(item);
       this.editableTabsValue = item.name;
     },
@@ -238,7 +235,7 @@ export default {
       this.editableTabs = tabs.filter(tab => tab.name !== targetName);
     }
   }
-  }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index d21949b8..d00b12f0 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/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
diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue
index 92b6ec19..d00b12f0 100644
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/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