Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/collect/CollectOrderTabs.vue

@@ -126,7 +126,10 @@
             <!--            <i class="el-icon-s-fold"></i>-->
             <span slot="title">上货记录</span>
           </el-menu-item>
-
+          <el-menu-item :index=14 @click="clickMenuItem(14)"  v-if="workPlaceClass == 1" >
+            <!--            <i class="el-icon-s-platform"></i>-->
+            <span slot="title">处理预验收</span>
+          </el-menu-item>
 
 
 
@@ -285,6 +288,7 @@
 <script>
 import logoImg from '@/assets/logo/logo_dm.png'
 import DealOrder from '@/views/collect/DealOrder.vue'
+import DealOrderPre from '@/views/collect/DealOrderPre.vue'
 import ConfirmDrugDealOrder from '@/views/collect/ConfirmDrugDealOrder.vue'
 import CollectOrderAllot from '@/views/collect/CollectOrderAllot.vue'
 import CollectOrderEnd from '@/views/collect/CollectOrderEnd.vue'
@@ -309,6 +313,7 @@ import { EventBus } from '@/eventBus'
 export default {
   components: {
     DealOrder,
+    DealOrderPre,
     ConfirmDrugDealOrder,
     IoCreateOrderReturn,
     IoCreateOrderOut,
@@ -480,6 +485,15 @@ export default {
             message : ""
           }
         },
+        {
+          number: 14,
+          title: '处理预验收',
+          name: 'DealOrderPre',
+          component: DealOrderPre,
+          // 假设你需要传递的参数
+          componentProps: {
+          }
+        },
         ],
       editableTabs: [{
         number: 0,
@@ -559,7 +573,7 @@ export default {
       this.formData.busName = info.busName;
       this.autoTag = info.autoTag;
       this.editableTabs = []
-      this.clickMenuItem(0)
+      this.clickMenuItem(10)
       this.showChild = false;
       this.$nextTick(() => {
         this.showChild = true;