lucw 7 месяцев назад
Родитель
Сommit
08e92f32b6

+ 1 - 5
src/components/selectReleaseRules/select-release-rules.vue

@@ -224,7 +224,6 @@
         const API = this.notProduceTaskConfig
         const API = this.notProduceTaskConfig
           ? recordrulesNotProduceTaskConfigRecordRulesPage
           ? recordrulesNotProduceTaskConfigRecordRulesPage
           : recordrulesPage;
           : recordrulesPage;
-
         return API({
         return API({
           pageNum: page,
           pageNum: page,
           size: limit,
           size: limit,
@@ -241,10 +240,7 @@
       reload(where) {
       reload(where) {
         this.$refs.tableRef?.reload({
         this.$refs.tableRef?.reload({
           page: 1, // 已发布
           page: 1, // 已发布
-          publishStatus: 1,
-          // 启用
-          enable: 1,
-          ...where
+          where
         });
         });
       },
       },
       confirmSelection() {
       confirmSelection() {

+ 4 - 1
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -587,7 +587,9 @@
                 :type="
                 :type="
                   isView ||
                   isView ||
                   attributeData.approvalStatus == 1 ||
                   attributeData.approvalStatus == 1 ||
-                  attributeData.approvalStatus == 2 ? 'view' : 'add'
+                  attributeData.approvalStatus == 2
+                    ? 'view'
+                    : 'add'
                 "
                 "
                 size="mini"
                 size="mini"
               />
               />
@@ -1800,6 +1802,7 @@
           this.$refs.table.setData(
           this.$refs.table.setData(
             this.tableData.taskParam[this.currentIndex]?.produceList || []
             this.tableData.taskParam[this.currentIndex]?.produceList || []
           );
           );
+          this.$refs.userSettingMatterProcessRef.getMatterList();
         }, 500);
         }, 500);
 
 
         this.getBomLevel();
         this.getBomLevel();

+ 9 - 0
src/views/technology/production/components/user-setting-matter-process.vue

@@ -314,6 +314,15 @@
       addMatter(matter, rules) {
       addMatter(matter, rules) {
         const id = 'tem' + new Date().getTime();
         const id = 'tem' + new Date().getTime();
 
 
+        // 判断是否存在
+        const exists = this.matterList.some(
+          (item) => item.rulesId === matter.rulesId
+        );
+        if (exists) {
+          this.$message.warning('规则已存在,请勿重复添加');
+          return;
+        }
+
         // 处理detials
         // 处理detials
         if (rules.isExecuteMethod) {
         if (rules.isExecuteMethod) {
           matter.produceTaskConfigRuleDetails = Object.values(rules.detailMap)
           matter.produceTaskConfigRuleDetails = Object.values(rules.detailMap)