From 23751b81ca80b1e5d8cc1c60091e4a1b279291b8 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 11 Mar 2025 15:56:57 +0800
Subject: [PATCH] =?UTF-8?q?3/11=20=E4=B8=8A=E8=B4=A7=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E6=8B=86=E9=9B=B6=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderTabs.vue | 39 ++++++++++++++++++++++++--
 src/views/collect/IoCreateOrder.vue    |  8 +++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index db6ce375..5835a41d 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -93,6 +93,14 @@
 
               <span slot="title">工位上货</span>
             </el-menu-item>
+            <el-menu-item :index=15 @click="clickMenuItem(15)" v-if="workPlaceClass == 2">
+
+              <span slot="title">拆零上货</span>
+            </el-menu-item>
+            <el-menu-item :index=16 @click="clickMenuItem(16)" v-if="workPlaceClass == 2">
+
+              <span slot="title">整取上货</span>
+            </el-menu-item>
             <el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2">
 
               <span slot="title">工位剔除</span>
@@ -327,6 +335,8 @@ import IoSplitFifoRemind from '@/views/collect/IoSplitFifoRemind.vue'
 import IocCollectOrderCheckCode from '@/views/collect/IocCollectOrderCheckCode.vue'
 import IocCollectOrderVerify from '@/views/collect/IocCollectOrderVerify.vue'
 import IoSplitFifoRemove from '@/views/collect/IoSplitFifoRemove.vue'
+import IoSplitCreateOrder from '@/views/collect/IoCreateOrder.vue'
+import IoFullCreateOrder from '@/views/collect/IoCreateOrder.vue'
 
 // 导入器械相关工位上货页面
 import DevicesIoCreateOrderOut from '@/views/collect/device/DevicesIoCreateOrder.vue'
@@ -366,6 +376,7 @@ export default {
     IoCreateOrderOutRecord,
     IocCollectOrderVerify,
     IoSplitFifoRemove,
+    IoSplitCreateOrder,
 
     //器械页面
     DevicesDealOrder,
@@ -439,7 +450,8 @@ export default {
           component: IoCreateOrderOut,
           // 假设你需要传递的参数
           componentProps: {
-            fromSplitType: 'out'
+            fromSplitType: 'out',
+            fifoSplitTag: 0
           }
         },
         {
@@ -550,6 +562,28 @@ export default {
           // 假设你需要传递的参数
           componentProps: {}
         },
+        {
+          number: 15,
+          title: '拆零上货',
+          name: 'IoSplitCreateOrder',
+          component: IoSplitCreateOrder,
+          // 假设你需要传递的参数
+          componentProps: {
+            fromSplitType: 'out',
+            fifoSplitTag: 1
+          }
+        },
+        {
+          number: 16,
+          title: '整取上货',
+          name: 'IoFullCreateOrder',
+          component: IoFullCreateOrder,
+          // 假设你需要传递的参数
+          componentProps: {
+            fromSplitType: 'out',
+            fifoSplitTag: 2
+          }
+        },
 
         //器械页面
         {
@@ -1013,7 +1047,8 @@ export default {
             component: IoCreateOrderOut,
             // 假设你需要传递的参数
             componentProps: {
-              fromSplitType: 'out'
+              fromSplitType: 'out',
+              fifoSplitTag:0
             }
           }
           ]
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index c1e85e2d..a48e23eb 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -436,7 +436,11 @@ export default {
     resetKey: {
       type: Function,
       required: true
-    }
+    },
+    fifoSplitTag: {//拆零标记
+      type: Object,
+      required: true
+    },
 
   },
   watch: {
@@ -1188,6 +1192,8 @@ export default {
 
     //添加条码后提交
     addCodeSubmit(tQuery) {
+      console.log("当前拆零标记" , this.fifoSplitTag)
+      tQuery.fifoSplitTag = this.fifoSplitTag
       addOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.orderFormData.billNo = response.data.orderId