Merge branch 'dev' into test

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -104,7 +104,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="记录规则编码" prop="code">
+          <el-form-item :label="qmsReportWorkType.includes(formData.reportWorkType)?'模板编码':'记录规则编码'" prop="code">
             <el-input
               v-model="formData.code"
               :disabled="true"
@@ -113,7 +113,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="记录规则版本">
+          <el-form-item :label="qmsReportWorkType.includes(formData.reportWorkType)?'模板版本':'记录规则版本'">
             <el-input
               :value="versionText"
               disabled
@@ -122,7 +122,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="记录规则名称" prop="name">
+          <el-form-item :label="qmsReportWorkType.includes(formData.reportWorkType)?'模板名称':'记录规则名称'"  prop="name">
             <el-input
               v-model="formData.name"
               placeholder="请输入"

src/views/rulesManagement/releaseRules/index.vue

@@ -445,6 +445,7 @@
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
         const typeWhere = {};
+        console.log('this.treeNode~~~~~~~~~~~~~~~', this.treeNode);
         if (this.treeNode && this.treeNode.item) {
           if (this.treeNode.type === 'industry') {
             typeWhere.industryType = this.treeNode.item.industryType;
@@ -479,7 +480,32 @@
       },
       /* 刷新表格 */
       reload(where) {
-        this.$refs.table.reload({ page: 1, where });
+        const typeWhere = {};
+        if (this.treeNode && this.treeNode.item) {
+          if (this.treeNode.type === 'industry') {
+            typeWhere.industryType = this.treeNode.item.industryType;
+          } else if (this.treeNode.type === 'business') {
+            typeWhere.industryType = this.treeNode.item.industryType;
+            typeWhere.businessType = this.treeNode.item.businessType;
+          } else if (this.treeNode.type === 'reportWork') {
+            typeWhere.industryType = this.treeNode.item.industryType;
+            typeWhere.businessType = this.treeNode.item.businessType;
+            typeWhere.reportWorkType = this.treeNode.item.reportWorkType;
+          } else if (this.treeNode.type === 'scene') {
+            typeWhere.industryType = this.treeNode.item.industryType;
+            typeWhere.businessType = this.treeNode.item.businessType;
+            typeWhere.reportWorkType = this.treeNode.item.reportWorkType;
+            typeWhere.classify = this.treeNode.item.sceneType;
+          } else {
+            typeWhere.industryType = this.treeNode.item.industryType;
+            typeWhere.businessType = this.treeNode.item.businessType;
+            typeWhere.reportWorkType = this.treeNode.item.reportWorkType;
+            typeWhere.classify = this.treeNode.item.sceneType;
+            typeWhere.recordTemplateStyle =
+              this.treeNode.item.templateStyleType;
+          }
+        }
+        this.$refs.table.reload({ page: 1, where, ...typeWhere });
       },
       // 发布
       async publish(row) {
@@ -619,15 +645,16 @@
         tree.forEach(clean);
 
         this.typeTree = tree; // 结果树
-
+        
         if (!this.treeNode) {
           // 默认选中第一个节点
           this.treeNode = this.typeTree.length > 0 ? this.typeTree[0] : null;
+          // console.log('this.treeNode`1111111111111111111111`', this.treeNode);
           if (this.treeNode) {
             // 默认选中节点
             this.$nextTick(() => {
               this.$refs.treeRef.setCurrentKey(this.treeNode.id);
-              // this.reload();
+              this.reload();
             });
           }
         }

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

@@ -123,7 +123,7 @@
         <div class="mask-box" @click="selectRulesId">
           <el-input
             v-model="formData.planConfigName"
-            placeholder="请选择设备有关计划规则，巡点检规则"
+            placeholder="请选择设备有关计划规则、巡点检规则、保养规则"
             size="small"
             :readonly="true"
           >

src/views/technology/version/components/user-search.vue

@@ -18,7 +18,7 @@
         </el-form-item>
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
-        <el-form-item label="工艺编码:">
+        <el-form-item label="工艺类型编码:">
           <el-input
             clearable
             v-model.trim="where.code"
@@ -27,7 +27,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
-        <el-form-item label="工艺名称:">
+        <el-form-item label="工艺类型名称:">
           <el-input
             clearable
             v-model.trim="where.name"