Преглед изворни кода

feat: 新增锅炉运行记录并修复参数逻辑

yusheng пре 2 месеци
родитељ
комит
270c0ac535

+ 22 - 6
src/views/rulesManagement/recordPlan/components/programRulesDialog.vue

@@ -51,6 +51,7 @@
               <el-option :value="3" label="注汽检查记录"></el-option>
               <el-option :value="4" label="固废记录"></el-option>
               <el-option :value="5" label="蒸汽质量检查记录"></el-option>
+              <el-option :value="6" label="锅炉运行记录"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -174,6 +175,7 @@
               v-model="addForm.associatedObject"
               size="small"
               style="width: 100%"
+              @change="associatedObjectChange"
             >
               <el-option :value="1" label="车间"></el-option>
               <el-option :value="2" label="设备"></el-option>
@@ -286,9 +288,7 @@
                 type="danger"
                 :underline="false"
                 icon="el-icon-delete"
-                @click="
-                  item.deviceInfo.splice(item.deviceInfo.indexOf(row), 1)
-                "
+                @click="item.deviceInfo.splice(item.deviceInfo.indexOf(row), 1)"
               >
                 删除
               </el-link>
@@ -675,7 +675,7 @@
         configType: 1,
         createUserName: '',
         duration: null,
-        associatedObject: 1,
+        associatedObject: 2,
         planType: 1,
         executeUsers: [
           // {
@@ -954,6 +954,10 @@
       this.getAllTeamList();
     },
     methods: {
+      associatedObjectChange() {
+        this.addForm.children = [];
+      },
+
       // 外部调用,打开弹窗
       open(type, data) {
         console.log('type data', type, data);
@@ -1208,7 +1212,19 @@
           }
         });
 
-        console.log('规则明细数据', data.details);
+        console.log('规则明细数据', rules);
+        let deviceInfo = [];
+        if (rules.deviceId) {
+          deviceInfo = [
+            {
+              code: rules.deviceCode,
+              codeNumber: rules.codeNumber,
+              fixCode: rules.fixCode,
+              id: rules.deviceId,
+              name: rules.deviceName
+            }
+          ];
+        }
 
         this.addForm.children.push({
           ruleId: rules.id,
@@ -1216,7 +1232,7 @@
           details: data.details,
           children: [],
           workshops: [],
-          deviceInfo: [],
+          deviceInfo,
           classify: rules.classify,
           recordTemplateStyle: rules.recordTemplateStyle,
           reportWorkType: rules.reportWorkType

+ 6 - 6
src/views/rulesManagement/releaseRules/components/bindSubstanceList.vue

@@ -175,20 +175,20 @@
       },
 
       handleNodeClick(data) {
-        if (data.id == this.treeList[0].id) {
-          this.physicalList = [];
-          return;
-        }
+        // if (data.id == this.treeList[0].id) {
+        //   this.physicalList = [];
+        //   return;
+        // }
         this.current = data;
         this.$refs.table.clearSelection();
         this.getPhysicalModel(data.id);
       },
-      open(id, name) {
+      open(id, name,code) {
         this.visible = true;
         if (id) {
           this.treeList.push({
             id,
-            name,
+            name,code,
             children: []
           });
           this.$nextTick(() => {

+ 8 - 6
src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -529,7 +529,7 @@
             placeholder="请输入参数上限"
             size="mini"
           ></el-input>
-          <span v-else-if="row.paramType == 7 && row.substanceId">{{
+          <span v-else-if="row.paramType == 7 && row.paramCode">{{
             row.maxValue
           }}</span>
         </template>
@@ -540,7 +540,7 @@
             placeholder="请输入参数下限"
             size="mini"
           ></el-input>
-          <span v-else-if="row.paramType == 7 && row.substanceId">{{
+          <span v-else-if="row.paramType == 7 && row.paramCode">{{
             row.minValue
           }}</span>
         </template>
@@ -559,7 +559,7 @@
             size="mini"
           >
           </DictSelection>
-          <span v-else-if="row.paramType == 7 && row.substanceId">{{
+          <span v-else-if="row.paramType == 7 && row.paramCode">{{
             row.unitName
           }}</span>
         </template>
@@ -1827,7 +1827,8 @@
         if (this.formData.reportWorkType == 5) {
           this.$refs.bindSubstanceRef.open(
             this.formData.deviceId,
-            this.formData.deviceName
+            this.formData.deviceName,
+            this.formData.deviceCode,
           );
         } else {
           this.$refs.toolModalRef.open(row.toolCodes);
@@ -1837,7 +1838,8 @@
         this.currentIndex = 9999;
         this.$refs.bindSubstanceRef.open(
           this.formData.deviceId,
-          this.formData.deviceName
+          this.formData.deviceName,
+          this.formData.deviceCode,
         );
       },
       bindSubstanceSuccess(list) {
@@ -1865,7 +1867,7 @@
               productCode: '',
               paramCode: item.paramCode,
               substanceId: item.substanceId,
-              substanceCode: item.paramCode,
+              substanceCode: item.substanceCode,
               substanceName: item.substanceName,
               // 1-成品统计,2-物料统计,3-工序统计"
               statisticsType:

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

@@ -167,6 +167,7 @@
       ref="selectReleaseRulesRef"
       @chooseRules="chooseReleaseRules"
       :notProduceTaskConfig="notProduceTaskConfig"
+      :businessType="1"
     ></selectReleaseRules>
 
     <selectPlanRules

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

@@ -169,7 +169,7 @@
         const list = this.dict['record_rules_report_work_type'] || [];
         // 排除过程控制
         return list.filter(
-          (item) => item.dictCode != '2' && item.dictCode != '4'
+          (item) => item.dictCode != '2' && item.dictCode != '4'&& item.dictCode != '5'
         );
         // return list;
       }