修改bug

src/views/produceOrder/workReport.vue

@@ -12,37 +12,6 @@
       <div>
         <div>
           <div class="seek-list" style="background-color: #157a2c">
-            <!-- <div>
-              <el-input
-                style="width: 180px; margin-right: 5px"
-                clearable
-                v-model="keyWord"
-                placeholder="请输入关键字"
-                @clear="handleSearch"
-              />
-
-              <el-button
-                size="mini"
-                type="primary"
-                style="margin: 0 5px"
-                @click="handleSearch"
-                >查询</el-button
-              >
-
-              <template>
-                <el-popover
-                  placement="top-start"
-                  width="200"
-                  trigger="hover"
-                  content="支持工单编码，产品编码，产品名称，产品规格，牌号，型号，批次号查询。"
-                >
-                  <i
-                    class="el-icon-question"
-                    slot="reference"
-                    style="color: #40a9ff; font-size: 14px"
-                  ></i> </el-popover
-              ></template>
-            </div> -->
             <div
               style="
                 width: 100%;
@@ -100,7 +69,7 @@
             </el-steps>
           </div>
 
-          <el-tabs type="border-card">
+          <el-tabs type="border-card" :key="drawerKey">
             <el-tab-pane label="基本信息">
               <ele-split-layout
                 space="0px"
@@ -157,15 +126,6 @@
                         :workPlanType="workPlanType"
                       ></warehousing>
 
-                      <!-- // 设备 入库 -->
-                      <!-- 普通报工 -->
-                      <!-- <jobBooking
-                  v-else
-                  :workListIds="workListIds"
-                  ref="jobRef"
-                  :reportNeedFeed="reportNeedFeed"
-                ></jobBooking> -->
-
                       <jobBooking
                         v-else-if="isFinalCheckProduction"
                         :workListIds="workListIds"
@@ -174,15 +134,6 @@
                         @jobSuccess="jobSuccess"
                         :workPlanType="workPlanType"
                       ></jobBooking>
-
-                      <!-- <workPlan
-                  style="width: 100%"
-                  v-else
-                  :workListIds="workListIds"
-                  ref="jobRef"
-                  :reportNeedFeed="reportNeedFeed"
-                >
-                </workPlan> -->
                     </div>
 
                     <!-- 工步 -->
@@ -229,14 +180,6 @@
                         v-if="isOutsource"
                       ></outsourceList>
 
-                      <!--   -->
-                      <!-- <outsourceList
-                        :outsourceFormVal="outObj"
-                        @closeForm="closeForm"
-                        @outScucc="outScucc"
-                        v-if="isOutsource"
-                      ></outsourceList> -->
-
                       <pleaseEntrust
                         :outsourceFormVal="outObj"
                         @closeForm="closeForm"
@@ -316,14 +259,12 @@
   import TaskDialog from '@/views/produce/components/taskDialog/index.vue';
   import Search from '@/views/produce/components/search.vue';
   import footBtn from '@/views/produce/components/footBtn.vue';
-  // import produceOrder from './components/produceOrder.vue';
   import produceOrder from '@/views/produce/components/new_produceOrder.vue';
   import productionResource from '@/views/produce/components/productionResource/index.vue';
   import outsourcing from '@/views/produce/components/outsourcing/index.vue';
   import picking from '@/views/produce/components/picking/index.vue';
   import wokePopup from '@/views/produce/components/picking/wokePopup.vue';
   import inspection from '@/views/produce/components/inspection/newIndex.vue';
-  // import inspection from './components/inspection/index.vue';
 
   import pickDetails from '@/views/produce/components/picking/details.vue';
   import AssetTree from '@/components/AssetTree/joobIndex.vue';
@@ -332,9 +273,7 @@
 
   import jobBooking from '@/views/produce/components/jobBooking/index.vue';
   import workPlan from '@/views/produce/components/workPlan/index.vue';
-  // import workes from './components/workPlan/components/work.vue';
   import warehousing from '@/views/produce/components/warehousing/index.vue';
-  // import outsourceList from '@/views/produce/components/outsourcing/outsourceList.vue';
   import outsourceList from '@/views/produce/components/outsourcing/new_outsourceList.vue';
   import pleaseEntrust from '@/views/produce/components/outsourcing/pleaseEntrust.vue';
   import workStep from '@/views/produce/components/workStep/index.vue';
@@ -452,7 +391,8 @@
         produceList: [],
         workPlanType: '',
         isPleaseEntrust: false,
-        workInfoList: {}
+        workInfoList: {},
+        drawerKey: 0
       };
     },
 
@@ -533,26 +473,6 @@
       setRootId(id) {
         this.rootId = id;
       },
-      // 点击工序
-      // handleNodeClick(data) {
-      //   this.feedNeedEquipment = data.feedNeedEquipment;
-      //   this.reportNeedFeed = data.reportNeedFeed;
-
-      //   let obj = {
-      //     1: `${data.workCenterName}-${data.name}(普通工序)`,
-      //     3: `${data.workCenterName}-${data.name}(质检工序)`,
-      //     4: `${data.workCenterName}-${data.name}(包装工序)`,
-      //     5: `${data.workCenterName}-${data.name}(入库工序)`,
-      //     6: `${data.workCenterName}-${data.name}(质检工序)`
-      //   };
-
-      //   this.title = obj[data.type] || '';
-      //   this.type = data.type;
-      //   let taskObj = {};
-      //   taskObj = this.routeList.find((item) => item.taskId === data.taskId);
-      //   console.log(taskObj, 'taskObj');
-      //   this.$store.commit('user/setTaskObj', taskObj);
-      // },
 
       handleChoose(val) {
         console.log(val);
@@ -571,14 +491,6 @@
           });
           this.produceTaskList = res;
           this.arr = JSON.parse(JSON.stringify(this.produceTaskList));
-          //默认选择第一个工序
-          // if (this.produceTaskList?.length) {
-          //   this.$store.commit('user/setTaskObj', this.produceTaskList[0]);
-          //   this.$nextTick(() => {
-          //     this.$refs.taskListRef.setCurrentKey(this.produceTaskList[0].id);
-          //   });
-          // }
-          // newName
         });
       },
 
@@ -623,24 +535,6 @@
         });
       },
 
-      // 切换组件
-      // async changePlugIn(e) {
-      //   this.outObj = e;
-
-      //   let req = {
-      //     taskId: e.taskId,
-      //     taskIds: e.taskIds,
-      //     workOrderId: e.workOrderId,
-      //     quantity: e.formedNumLast
-      //   };
-      //   const res = await checkOutsourceMaterial(req);
-
-      //   this.outObj = { ...res.data, ...this.outsourceForm, ...this.outObj };
-
-      //   this.isStep = false;
-      //   this.isOutsource = true;
-      // },
-
       async changePlugIn(e, index) {
         if (index == '1') {
           this.outObj = e;
@@ -682,13 +576,18 @@
         this.wokePopup = false;
       },
 
-      open(row) {
+      async open(row) {
+        this.drawerKey++;
         this.curTaskObj = null;
         this.workOrderInfo = row;
         this.routeObj.id = this.workOrderInfo.id;
-        this.getTaskFn();
+        this.operationType = '';
+        // this.getTaskFn();
         this.drawer = true;
-        this.getOrderData();
+        // this.getOrderData();
+
+        await this.getOrderData();
+        await this.getTaskFn();
       },
 
       async getOrderData() {
@@ -843,31 +742,6 @@
             }
           }
 
-          // let resultValue = '0';
-          // await parameterGetByCode({
-          //   code: 'first_article_dual_inspection_for_report'
-          // }).then((res) => {
-          //   resultValue = res.value;
-          // });
-
-          // if (resultValue == '1') {
-          // this.isFinalCheckProduction = false;
-          // if (this.taskObj.id != '-1') {
-          //   const result = await this.checkQualityResult();
-          //   if (!result) return;
-
-          //   const firstArticleResult =
-          //     result.firstArticleDualInspectionResult ?? true;
-
-          //   this.isFinalCheckProduction = firstArticleResult;
-
-          //   if (!firstArticleResult) {
-          //     return this.$message.warning('请完成首件两检再报工！');
-          //   }
-          // }
-
-          // this.isFinalCheckProduction = true;
-
           if (this.taskObj.id != '-1') {
             const result = await this.checkQualityResult();
             if (!result) return;
@@ -905,12 +779,6 @@
             return this.$message.warning('工步只能选择一个工单！');
           }
           this.$refs.workStepRef.open(this.workStepQueryParam);
-          // let req = {
-          //   taskId: this.taskObj.id,
-          //   workOrderId: this.workListIds[0]
-          // };
-
-          // this.$refs.wokePopupRef.open(req);
         }
         if (t === 'task') {
           if (this.workListIds.length > 1) {
@@ -929,15 +797,7 @@
           // console.log(this.workListIds, 'this.workListIds');
           this.$refs.createErrorRef.open('add', this.workOrderInfo);
         }
-        // 工艺路线 *** 修改 判断只能选择一个
-        // if (t === 'work') {
-        //   let req = {
-        //     taskId: this.taskObj.id,
-        //     workOrderId: this.workListIds[0]
-        //   };
-
-        //   this.$refs.wokePopupRef.open(req);
-        // }
+
         if (t === 'work') {
           if (this.workListIds.length > 1) {
             return this.$message.warning('工艺文件只能选择一个工单！');
@@ -1017,14 +877,6 @@
           this.workListIds = [this.workOrderInfo.id];
         }
 
-        // if (item.taskId == -2) {
-        //   this.$message.info('完结状态不能点击');
-        //   return;
-        // } else {
-        //   this.desIndex = index;
-        //   this.newId = this.routeList[this.desIndex].taskId || '';
-        //   this.getTaskName(this.workOrderInfo);
-        // }
         if (item.taskId != -2) {
           this.desIndex = index;
           this.newId = this.routeList[this.desIndex].taskId || '';
@@ -1072,12 +924,6 @@
                 this.$refs.outsourcingListRef.getDataList(this.workData.code);
               });
             }
-
-            // console.log(
-            //   this.$refs.outsourcingListRef,
-            //   'this.$refs.outsourcingListRef'
-            // );
-            // this.$refs.outsourcingListRef.getDataList(this.workData.code);
           } else {
             return this.$message.warning('此工序不能委外');
           }
@@ -1196,19 +1042,6 @@
 </script>
 
 <style lang="scss" scoped>
-  // .content_box {
-  // display: flex;
-  // }
-
-  // .content_box_tab {
-  //   width: 220px;
-  //   padding: 5px;
-  //   height: 100vh;
-  //   background-color: #fff;
-  //   overflow-y: auto;
-  //   border: 1px solid blue;
-  // }
-
   .footBtn {
     position: absolute;
     bottom: 20px;