fix: 提交

src/views/collect/CollectOrderTabs.vue

@@ -45,44 +45,72 @@
         <el-menu
           :default-active="menuActive"
           class="el-menu-vertical-demo"
+          style="width: 100%"
+          unique-opened="true"
           @open="handleOpen">
+
+          <el-submenu index="11">
+            <template slot="title">
+              <i class="el-icon-s-order"></i>
+              <span>单据管理</span>
+            </template>
             <el-menu-item :index=0 @click="clickMenuItem(0)">
-            <i class="el-icon-edit-outline"></i>
+<!--              <i class="el-icon-edit-outline"></i>-->
               <span slot="title">处理单据</span>
             </el-menu-item>
 
             <el-menu-item :index=4 @click="clickMenuItem(4)">
-            <i class="el-icon-s-order"></i>
+<!--              <i class="el-icon-s-order"></i>-->
               <span slot="title">待处理单</span>
             </el-menu-item>
             <el-menu-item :index=5 @click="clickMenuItem(5)">
-            <i class="el-icon-s-claim"></i>
+<!--              <i class="el-icon-s-claim"></i>-->
               <span slot="title">已完成单</span>
             </el-menu-item>
           <el-menu-item :index=6 @click="clickMenuItem(6)">
-            <i class="el-icon-upload"></i>
+<!--            <i class="el-icon-upload"></i>-->
             <span slot="title">单据上传</span>
           </el-menu-item>
+          </el-submenu>
+
+
+          <el-submenu index="33">
+            <template slot="title">
+              <i class="el-icon-s-platform"></i>
+              <span>工位管理</span>
+            </template>
+
           <el-menu-item :index=1 @click="clickMenuItem(1)">
-            <i class="el-icon-s-unfold"></i>
+<!--            <i class="el-icon-s-unfold"></i>-->
             <span slot="title">工位上货</span>
           </el-menu-item>
           <el-menu-item :index=2 @click="clickMenuItem(2)">
-            <i class="el-icon-s-fold"></i>
+<!--            <i class="el-icon-s-fold"></i>-->
             <span slot="title">工位退货</span>
           </el-menu-item>
           <el-menu-item :index=3 @click="clickMenuItem(3)">
-            <i class="el-icon-s-platform"></i>
+<!--            <i class="el-icon-s-platform"></i>-->
             <span slot="title">工位库存</span>
           </el-menu-item>
-          <el-menu-item :index=7 @click="clickMenuItem(7)">
+
+          </el-submenu>
+
+
+          <el-submenu index="22">
+            <template slot="title">
               <i class="el-icon-s-help"></i>
+              <span>库存管理</span>
+            </template>
+          <el-menu-item :index=7 @click="clickMenuItem(7)">
+<!--            <i class="el-icon-s-help"></i>-->
             <span slot="title">拆零管理</span>
           </el-menu-item>
           <el-menu-item :index=8 @click="clickMenuItem(8)">
-            <i class="el-icon-warning"></i>
+<!--            <i class="el-icon-warning"></i>-->
             <span slot="title">存量预警</span>
           </el-menu-item>
+          </el-submenu>
+
         </el-menu>
       </el-col>
 
@@ -101,7 +129,8 @@
               <li @click="closeAllTabs">关闭所有</li>
             </ul>
             <div >
-              <component v-if="showChild" :is="item.component" v-bind="item.componentProps" :reset-key="resetKeys[item.name]" @parent-method="parentMethod" />
+              <component v-if="showChild" :is="item.component" v-bind="item.componentProps" :reset-key="resetKeys[item.name]" @parent-method="parentMethod"
+              style="margin-top: -14px"/>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -115,7 +144,7 @@
       :visible.sync="selectBusTypeDisabled"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      :show-close="false"
+      :show-close="selectBusTypeClosrrButDisabled"
       v-if="selectBusTypeDisabled"
       width="65%"
       append-to-body
@@ -194,6 +223,7 @@ export default {
       showContextMenu: false, // 控制上下文菜单的显示
       contextMenuPosition: { x: 0, y: 0 }, // 上下文菜单的位置
       selectBusTypeDisabled: false,
+      selectBusTypeClosrrButDisabled: false,
       selectWorkplaceStatusDisabled: false,
       busQuery: {
         busKey: '',
@@ -340,6 +370,9 @@ export default {
     toggleBusType() {
       //隐藏下拉框内容
       // this.$refs.selectHeadEmpId.blur();
+
+      //切换业务时 可以有关闭按钮展示
+      this.selectBusTypeClosrrButDisabled = true
       this.selectBusTypeDisabled = true
     },
     selectBusType(info) {
@@ -357,6 +390,7 @@ export default {
         this.showChild = true;
       });
       this.selectBusTypeDisabled = false
+      this.selectBusTypeClosrrButDisabled = false
     },
     parentMethod(data) {
       const foundTab = this.findAllTabByName(data)

src/views/collect/DealOrder.vue

@@ -181,8 +181,8 @@
         </el-descriptions>
       </el-card>
 
-      <el-tabs type="border-card" style="margin: 15px">
+      <el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue">
-        <el-tab-pane label="扫码详情">
+        <el-tab-pane label="扫码详情" name="prescribeOriginPanel">
           <prescribeOriginPanel
             v-if="panelALive"
             :prescribeData="curRow"
@@ -196,21 +196,21 @@
         <!--            :refreshPanel="refreshCodesPanelP"-->
         <!--          ></PanelOrderManuTagCode>-->
         <!--        </el-tab-pane>-->
-        <el-tab-pane label="拆零详情">
+        <el-tab-pane label="拆零详情" name="prescribeCodePanel1">
           <prescribeCodePanel
             v-if="panelALive"
             :prescribeData="curRow"
             :fifoSplit="1"
           ></prescribeCodePanel>
         </el-tab-pane>
-        <el-tab-pane label="整取详情">
+        <el-tab-pane label="整取详情" name="prescribeCodePanel2">
           <prescribeCodePanel
             v-if="panelALive"
             :prescribeData="curRow"
             :fifoSplit="2"
           ></prescribeCodePanel>
         </el-tab-pane>
-        <el-tab-pane label="整单详情">
+        <el-tab-pane label="整单详情" name="PanelOrderAllDetail">
           <PanelOrderAllDetail
             v-if="panelALive"
             :prescribeData="curRow"
@@ -324,6 +324,13 @@ export default {
   },
   data() {
     return {
+      tabsName:[
+        'prescribeOriginPanel',
+        'prescribeCodePanel1',
+        'prescribeCodePanel2',
+        'PanelOrderAllDetail',
+      ],
+      editableTabsValue: 'prescribeOriginPanel',
       fromInvOptions: [],
       //界面配置相关
       //患者处方
@@ -820,12 +827,22 @@ export default {
 
       this.curRow = this.formData;
       this.dealSplitOrder()
+      //处理哪个活动的明细子组件
+      this.selectTabsname(this.formData.busType);
       this.formData.tagStatus = 2;
       this.updateOrder();
       this.refreshCodesPanel(this);
       this.$refs.inputRef.focus();
     },
-
+    selectTabsname(value){
+      if (this.$isBlank(this.filterQuery.code) && this.busTypeList.length > 0){
+        let busType = this.busTypeList.find(item => item.documentTypeCode === value);
+        let autoTag = busType.autoTag;
+        if (autoTag == 1){
+          this.editableTabsValue = this.tabsName[1]
+        }
+      }
+    },
     //开始拆零
     dealSplitOrder() {
       startSplit(this.formData).then(res => {

src/views/collect/IoCreateOrder.vue

@@ -7,7 +7,7 @@
       @submit.native.prevent
       label-width="110px"
     >
-      <el-card style="margin: 5px;">
+      <el-card >
 
         <!--        <el-row :gutter="0" v-if="isLinkDisabled">-->
         <!--          <el-col :span="24" align="right">-->