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

src/views/collect/CollectOrderTabs.vue

@@ -93,23 +93,23 @@
           <div v-if=" busType == 1">
 
 
-          <el-menu-item :index=15 @click="clickMenuItem(15)" v-if="workPlaceClass == 1">
+          <el-menu-item :index=15 @click="clickMenuItem(1000)" v-if="workPlaceClass == 1">
             <!--            <i class="el-icon-upload"></i>-->
             <span slot="title">处理单据(器械)</span>
           </el-menu-item>
-          <el-menu-item :index=16 @click="clickMenuItem(16)" v-if="workPlaceClass == 1">
+          <el-menu-item :index=16 @click="clickMenuItem(100)" v-if="workPlaceClass == 1">
             <!--              <i class="el-icon-edit-outline"></i>-->
             <span slot="title">单据审核(器械)</span>
           </el-menu-item>
-          <el-menu-item :index=17 @click="clickMenuItem(17)" v-if="workPlaceClass == 1">
+          <el-menu-item :index=17 @click="clickMenuItem(400)" v-if="workPlaceClass == 1">
             <!--              <i class="el-icon-edit-outline"></i>-->
             <span slot="title">待处理单(器械)</span>
           </el-menu-item>
-          <el-menu-item :index=18 @click="clickMenuItem(18)" v-if="workPlaceClass == 1">
+          <el-menu-item :index=18 @click="clickMenuItem(500)" v-if="workPlaceClass == 1">
             <!--              <i class="el-icon-s-claim"></i>-->
             <span slot="title">已完成单(器械)</span>
           </el-menu-item>
-          <el-menu-item :index=19 @click="clickMenuItem(19)" v-if="workPlaceClass == 1">
+          <el-menu-item :index=19 @click="clickMenuItem(600)" v-if="workPlaceClass == 1">
             <!--              <i class="el-icon-s-claim"></i>-->
             <span slot="title">单据上传(器械)</span>
           </el-menu-item>
@@ -543,7 +543,7 @@ export default {
 
         //器械页面
         {
-          number: 15,
+          number: 1000,
           title: '处理单据(器械)',
           name: 'DevicesDealOrder',
           component: DevicesDealOrder,
@@ -553,7 +553,7 @@ export default {
           }
         },
         {
-          number: 16,
+          number: 100,
           title: '单据审核(器械)',
           name: 'DevicesIocCollectOrderCheckCode',
           component: DevicesIocCollectOrderCheckCode,
@@ -563,7 +563,7 @@ export default {
           }
         },
         {
-          number: 17,
+          number: 400,
           title: '待处理单(器械)',
           name: 'DevicesCollectOrderAllot',
           component: DevicesCollectOrderAllot,
@@ -571,7 +571,7 @@ export default {
           componentProps: {}
         },
         {
-          number: 18,
+          number: 500,
           title: '已完成单(器械)',
           name: 'DevicesCollectOrderEnd',
           component: DevicesCollectOrderEnd,
@@ -579,7 +579,7 @@ export default {
           componentProps: {}
         },
         {
-          number: 19,
+          number: 600,
           title: '单据上传(器械)',
           name: 'DevicesCollectOrderUpload',
           component: DevicesCollectOrderUpload,
@@ -722,7 +722,7 @@ export default {
     },
     clickMenuItem(val) {
       //分两种 一种已存在 一种未存在
-      let item = this.componentTables[(val)]
+      let item = this.componentTables.find(tab => tab.number === val)
       if (val == 13){
         //如果是第一次 剔除页面没有创建 需要组件参数传递过去
         item.componentProps.message = this.sendData