完善维修管理的运行记录。

src/views/maintenance/components/MaterialAdd.vue

@@ -265,4 +265,10 @@
   .ml60 {
     margin-left: 60px;
   }
+  .rx-sc {
+    flex: 0 0 50px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>

src/views/maintenance/components/ProductModal.vue

@@ -280,16 +280,16 @@
             }
           }
         }
-        .rx-sc {
-          flex: 0 0 50px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
       }
     }
   }
 
+  .rx-sc {
+    flex: 0 0 50px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
   .ml60 {
     margin-left: 60px;
   }

src/views/maintenance/components/programRulesDialog.vue

@@ -90,9 +90,9 @@
           :span="8"
           v-if="addForm.autoOrder && !dialogTitle.includes('量具送检')"
         >
-          <el-form-item label="负责人" prop="executeId">
+          <el-form-item label="负责人" prop="executorId">
             <el-select
-              v-model="addForm.executeId"
+              v-model="addForm.executorId"
               size="small"
               style="width: 100%"
               :disabled="isBindPlan"
@@ -500,7 +500,7 @@
           categoryId: '', // 设备类别id
           approvalUserId: '', // 审核人id
           groupId: '', // 巡点检部门code
-          executeId: [], // 巡点检人员id
+          executorId: [], // 巡点检人员id
           executorPhone: '',
           status: 1, // 状态
           remark: '', // 备注
@@ -540,7 +540,7 @@
           groupId: [
             { required: true, message: '请选择巡点检部门', trigger: 'change' }
           ],
-          executeId: [
+          executorId: [
             { required: true, message: '请选择巡点检人员', trigger: 'change' }
           ],
           urgent: [
@@ -676,7 +676,7 @@
             categoryId: '', // 设备类别id
             approvalUserId: '', // 审核人id
             groupId: '', // 巡点检部门code
-            executeId: [], // 巡点检人员id
+            executorId: [], // 巡点检人员id
             executorPhone: '',
             status: 1, // 状态
             remark: '', // 备注
@@ -716,7 +716,7 @@
       },
       autoOrderChange(val) {
         if (val == 0) {
-          this.addForm.executeId = '';
+          this.addForm.executorId = '';
           this.addForm.groupId = '';
         }
       },
@@ -761,8 +761,8 @@
                   ruleId: item.ruleId,
                   categoryId: item.categoryId,
                   planDeviceList: planDeviceList[index],
-                  executorId: this.addForm.executeId
-                    ? this.addForm.executeId.join(',')
+                  executorId: this.addForm.executorId
+                    ? this.addForm.executorId.join(',')
                     : ''
                 };
               });
@@ -869,14 +869,15 @@
           ];
           console.log(this.ruleIdList);
           this.tabsValue = this.ruleIdList[0].ruleId;
-          // const params = { groupId: res.data.groupId };
-          // this.getUserList(params);
+
           // this._getMatterRulesDetails(res.ruleId);
           this.$set(this.addForm, 'code', res.data.code);
           this.$set(this.addForm, 'urgent', JSON.stringify(res.data.urgent));
-          this.$set(this.addForm, 'executeId', res.data.executeId.split(','));
+          this.$set(this.addForm, 'executorId', res.data.executorId.split(','));
           this.$set(this.addForm, 'imageUrl', {});
           console.log(this.rootData);
+
+          this.getUserList({ groupId: res.data.groupId });
           // const rep = await getTreeByType(0);
           // console.log('sasas', res);
           // const ids = this.findTopLevelAncestorId(

src/views/maintenance/components/signingUpWork.vue

@@ -30,7 +30,7 @@
       <div class="content-detail">
         <!-- 巡点检、保养设备 -->
         <div class="maintain_equipment_info">
-          <HeaderTitle title="巡点检设备" size="16px"></HeaderTitle>
+          <HeaderTitle title="运行设备" size="16px"></HeaderTitle>
           <div class="maintain_equipment_info_content">
             <div
               class="equipment_item"

src/views/maintenance/runRecord/plan/index.vue

@@ -258,7 +258,7 @@
       },
       goDetail({ id }) {
         this.$router.push({
-          path: '/maintenance/patrol/plan/details',
+          path: '/maintenance/runRecord/plan/details',
           query: {
             id
           }

src/views/maintenance/runRecord/workOrder/index.vue

@@ -17,14 +17,14 @@
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link
+          <!-- <el-link
             v-if="row.orderStatus === 3"
             type="primary"
             :underline="false"
             @click="handleExport(row)"
           >
             预览打印
-          </el-link>
+          </el-link> -->
           <el-link
             v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
             type="primary"
@@ -117,21 +117,21 @@
           },
           {
             prop: 'planName',
-            label: '巡点检名称',
+            label: '名称',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 120
           },
           {
             prop: 'executeGroupName',
-            label: '巡点检部门',
+            label: '部门',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 120
           },
           {
             prop: 'executeUserName',
-            label: '巡点检人员',
+            label: '人员',
             align: 'center',
             showOverflowTooltip: true
           },
@@ -259,7 +259,7 @@
       },
       goDetail({ id }) {
         this.$router.push({
-          path: '/maintenance/patrol/workOrder/details',
+          path: '/maintenance/runRecord/workOrder/details',
           query: {
             id
           }
@@ -272,13 +272,13 @@
       // 报工
       toSigningUpWork(row) {
         this.$refs.signingUpWorkRef.open(row);
-      },
-      handleExport(row) {
-        const url = `http://192.168.120.128:8085/jmreport/view/1060046036862939136?token=${getToken()}&id=${
-          row.id
-        }`;
-        window.open(url, '_blank');
       }
+      // handleExport(row) {
+      //   const url = `http://192.168.120.128:8085/jmreport/view/1060046036862939136?token=${getToken()}&id=${
+      //     row.id
+      //   }`;
+      //   window.open(url, '_blank');
+      // }
     }
   };
 </script>