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

+ 1 - 1
src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -112,7 +112,7 @@
               dictName="记录规则报工类型"
               placeholder="请选择模块"
               :clearable="false"
-              :disabled="type == 'processEdit'"
+              :isProhibit="type == 'processEdit'"
             ></dict-selection>
           </el-form-item>
         </el-col>

+ 2 - 2
src/views/technology/production/components/user-setting-matter-add.vue

@@ -183,9 +183,9 @@
         //设备名称
         deviceName: '',
         // 记录规则执行方式,参考字典项:record_rules_execute_method
-        executeMethod: '1',
+        executeMethod: '2',
         // 记录规则事项类型,参考字典项:record_rules_item_type
-        itemType: '1',
+        itemType: '2',
         // 工序ID
         produceTaskId: null,
         // 记录规则报工类型,参考字典项:record_rules_report_work_type

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

@@ -37,7 +37,7 @@
         <el-link
           type="primary"
           :underline="false"
-          icon="el-icon-edit"
+          icon="el-icon-view"
           @click="openEditMatter(row)"
         >
           详情
@@ -313,13 +313,16 @@
       },
       addMatter(matter, rules) {
         const id = 'tem' + new Date().getTime();
+        console.log('matter', matter, rules);
 
-        // 判断是否存在
-        const exists = this.matterList.some(
-          (item) => item.rulesId === matter.rulesId
-        );
-        if (exists) {
-          this.$message.warning('规则已存在,请勿重复添加');
+        if (matter.itemType == '2') {
+          // 判断是否存在
+          const exists = this.matterList.some(
+            (item) => item.rulesId === matter.rulesId
+          );
+          if (exists) {
+            this.$message.warning('规则已存在,请勿重复添加');
+          }
           return;
         }
 
@@ -332,8 +335,6 @@
           matter.produceTaskConfigRuleDetails = rules?.details || [];
         }
 
-        console.log('matter', matter, rules);
-
         // 添加事项
         this.matterList.push({
           ...matter,