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

src/views/collect/CollectOrderTabs.vue

@@ -101,30 +101,34 @@
               <!--            <i class="el-icon-s-unfold"></i>-->
               <span slot="title">工位上货</span>
             </el-menu-item>
-            <el-menu-item :index=2 @click="clickMenuItem(2)"  v-if="workPlaceClass == 2" >
-            <!--            <i class="el-icon-s-fold"></i>-->
-              <span slot="title">工位退货</span>
-            </el-menu-item>
+          <el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2">
+            <!--              <i class="el-icon-edit-outline"></i>-->
+            <span slot="title">工位剔除</span>
+          </el-menu-item>
+          <el-menu-item :index=8 @click="clickMenuItem(8)"  v-if="workPlaceClass == 2" >
+            <!--            <i class="el-icon-warning"></i>-->
+            <span slot="title">上货推荐</span>
+          </el-menu-item>
+
             <el-menu-item :index=3 @click="clickMenuItem(3)"  v-if="workPlaceClass == 2 || workPlaceClass == 1" >
             <!--            <i class="el-icon-s-platform"></i>-->
               <span slot="title">工位库存</span>
             </el-menu-item>
+          <el-menu-item :index=7 @click="clickMenuItem(7)"  v-if="workPlaceClass == 2" >
+            <!--            <i class="el-icon-s-help"></i>-->
+            <span slot="title">拆零管理</span>
+          </el-menu-item>
+          <el-menu-item :index=2 @click="clickMenuItem(2)"  v-if="workPlaceClass == 2" >
+            <!--            <i class="el-icon-s-fold"></i>-->
+            <span slot="title">工位退货</span>
+          </el-menu-item>
           <el-menu-item :index=12 @click="clickMenuItem(12)"  v-if="workPlaceClass == 2" >
             <!--            <i class="el-icon-s-fold"></i>-->
             <span slot="title">上货记录</span>
           </el-menu-item>
-            <el-menu-item :index=7 @click="clickMenuItem(7)"  v-if="workPlaceClass == 2" >
-            <!--            <i class="el-icon-s-help"></i>-->
-              <span slot="title">拆零管理</span>
-            </el-menu-item>
-            <el-menu-item :index=8 @click="clickMenuItem(8)"  v-if="workPlaceClass == 2" >
-            <!--            <i class="el-icon-warning"></i>-->
-              <span slot="title">存量预警</span>
-            </el-menu-item>
-          <el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2">
-            <!--              <i class="el-icon-edit-outline"></i>-->
-            <span slot="title">工位剔除</span>
-          </el-menu-item>
+
+
+
 
 <!--          </el-submenu>-->
 
@@ -427,7 +431,7 @@ export default {
         },
         {
           number: 8,
-          title: '存量预警',
+          title: '上货推荐',
           name: 'IoSplitFifoRemind',
           component: IoSplitFifoRemind,
           // 假设你需要传递的参数