Bladeren bron

修改bug

695593266@qq.com 2 maanden geleden
bovenliggende
commit
8a0b9db873

+ 7 - 1
src/views/produceOrder/components/releaseDialog/index.vue

@@ -605,6 +605,7 @@
         try {
           // /aps/assign/listByMesWorkOrder
           let allRes = await listByRoutingIds([this.current.produceRoutingId]); // 查询全部工序数据
+
           let params = {
             apsWorkOrderId: this.current.apsWorkOrderId,
             categoryId: this.current.categoryId,
@@ -642,8 +643,10 @@
             return;
           }
           // this.procTaskDis = false;
+          console.log(res, 'resresresres');
           let list = [];
           res.forEach((item, index) => {
+            console.log(item.type, 'itemitemitemitem');
             let obj = {
               id: item.sourceTaskId, //工序 id
               name: item.name, //工序 名称
@@ -662,7 +665,10 @@
                 lineDis: false // 产线按钮
               },
               isDisable:
-                this.form.workCenterId == item.workCenterId ? true : false,
+                this.form.workCenterId == item.workCenterId &&
+                item.type != 2 &&
+                item.type != 3 &&
+                item.type != 6,
               startDate: '', // 开始日期 (当前工序中最早的计划开始时间)
               endDate: '', // 结束日期 (当前工序中最晚的计划结束时间)
               workCenterId: item.workCenterId,

+ 4 - 1
src/views/produceOrder/components/releaseDialog/planDotLineReleaseDialog.vue

@@ -671,7 +671,10 @@
               isDisable:
                 teamIdSet.has(item.executionTeamId) &&
                 this.$store.state.user.info.userId ==
-                  item.executionTeamLeaderId,
+                  item.executionTeamLeaderId &&
+                item.type != 2 &&
+                item.type != 3 &&
+                item.type != 6,
               startDate: '', // 开始日期 (当前工序中最早的计划开始时间)
               endDate: '', // 结束日期 (当前工序中最晚的计划结束时间)
               workCenterId: item.workCenterId,