Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/api/material/list.js

@@ -160,4 +160,13 @@ export async function getProduceTreeByPid(parentId) {
     return res.data;
   }
   return Promise.reject(new Error(res.data.message));
+}  
+
+export async function changeOnOff(id) {
+  const res = await request.post(`/main/category/changeOnOff/${id}`);
+  console.log('changeOnOff', res);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }

src/views/material/product/components/index-data.vue

@@ -141,6 +141,20 @@
         >-->
       </template>
 
+      <template v-slot:isEnabled="{ row }">
+        <div>
+          <el-switch
+            v-model="row.isEnabled"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :active-value="1"
+            :inactive-value="0"
+            @change="changeEnable(row)"
+          >
+          </el-switch>
+        </div>
+      </template>
+
       <template v-slot:componentAttribute="{ row }">
         <div>
           <!-- {{ }} -->
@@ -306,7 +320,8 @@
     getMaterialList,
     removeMaterial,
     importCategorySparePart,
-    exportFile
+    exportFile,
+    changeOnOff
   } from '@/api/material/list.js';
 
   import { getBomGetById } from '@/api/material/BOM.js';
@@ -675,7 +690,9 @@
             prop: 'isEnabled',
             align: 'center',
             label: '状态',
+            slot: 'isEnabled',
             showOverflowTooltip: true,
+            fixed: 'right',
             formatter: (row, column) => {
               return row.isEnabled === 0
                 ? '停用'
@@ -736,6 +753,17 @@
     },
 
     methods: {
+      async changeEnable(row) {
+        const res = await changeOnOff(row.id);
+        if (res.code == 0) {
+          this.$message({
+            type: 'success',
+            message: '修改成功',
+            customClass: 'ele-message-border'
+          });
+          this.reload();
+        }
+      },
       onSortChange(e) {
         console.log(e, '99999999');
 

src/views/rulesManagement/recordPlan/components/programRulesDialog.vue

@@ -187,7 +187,7 @@
       <el-tabs
         v-model="tabsValue"
         type="card"
-        closable
+        :closable="type != 'detail'"
         @tab-click="handleTab"
         @tab-remove="removeTab"
       >

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="请输入"
@@ -1248,6 +1248,13 @@
         this.formData.stopDate = new Date(info.stopDate);
         this.formData.classify = this.formData.classify + '';
         this.formData.reportWorkType = this.formData.reportWorkType + '';
+        this.formData.industryType = this.formData.industryType + '';
+        this.formData.businessType = this.formData.businessType + '';
+        this.formData.reportWorkType = this.formData.reportWorkType + '';
+        this.formData.recordTemplateStyle =
+          this.formData.recordTemplateStyle + '';
+
+        console.log('this.formData~~~~', this.formData);
 
         this.getExecuteMethodList();
 

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"
           >
@@ -228,7 +228,7 @@
         if (this.formData.itemType == '2') {
           // 过程控制 只能选择按事项执行
           return list.map((item) => {
-            if (item.label == '任务驱动') {
+            if (item.label == '任务驱动' || (item.label == '事件驱动' && this.formData.reportWorkType === '2')) {
               item.disabled = true;
             } else {
               item.disabled = false;

src/views/technology/route/components/index-data.vue

@@ -414,12 +414,14 @@
       /* 表格数据源 */
       async datasource({ page, limit, where, order }) {
         this.currentPage = page;
+        // isEnabled 1：查启用  0：查停用，不传该参数查所有
         let labs = getMaterialList({
           pageNum: page,
           size: limit,
           ...this.sort,
           ...where,
-          categoryLevelId: this.currentId
+          categoryLevelId: this.currentId,
+          isEnabled: 1
         });
         this.whereData = {
           pageNum: page,

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"