代码提交

src/components/addPatrolConfigDialog/index.vue

@@ -550,22 +550,23 @@
         };
         try {
           const res = await getAssetList(params);
-          this.planRuleEquiList = res.list;
+          this.planRuleEquiList = res.list
+		  console.log(' this.planRuleEquiList', this.planRuleEquiList)
           this.planRuleEquiList.map((item) => {
-            item.showName = item.name + '(' + item.code + ')';
-          });
-          this.currentEquItemIndex = 0;
-          const item = this.planRuleEquiList[0];
-          const equiLocation = this.getEquiLocation(item);
+            item.showName = item.name + '(' + item.code + ')'
+          })
+          this.currentEquItemIndex = 0
+          const item = this.planRuleEquiList[0]
+          const equiLocation = this.getEquiLocation(item)
           this.$nextTick(() => {
-            this.$refs.equiListTree.setCurrentKey(item.id);
+            this.$refs.equiListTree.setCurrentKey(item.id)
             this.equipmentInfo = {
               equiCode: item.code,
               equiName: item.name,
               equiModel: item.category.modelType,
               equiLocation: equiLocation
-            };
-            this.planRuleEquiList[0]['equiLocation'] = equiLocation;
+            }
+            this.planRuleEquiList[0]['equiLocation'] = equiLocation
 
             // 对比详情返回的数据和设备分类下面所有的设备列表，将sparePart同步过去
             if (this.addForm.deviceInfo) {

src/enum/dict.js

@@ -19,5 +19,7 @@ export default {
   报修状态: 'report_repair_status',
   告警级别: 'warning_level',
   告警方式: 'warning_style',
-  告警触发条件: 'warning_conditions'
+  告警触发条件: 'warning_conditions',
+  计划性质: 'nature_plan',
+  巡点检工单状态: 'patrolwork_status'
 };

src/views/maintenance/patrol/work/components/work-search.vue

@@ -20,7 +20,7 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.staus">
+          <DictSelection dictName="巡点检工单状态" clearable v-model="where.staus">
           </DictSelection>
         </el-form-item>
       </el-col>

src/views/maintenance/repair/maintenancePlan/add.vue

@@ -21,75 +21,32 @@
           <el-form-item label="计划名称：" prop="planName">
             <el-input
               v-model.trim="addForm.planName"
-              size="small"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="审批部门：" prop="verifyDeptCode"> <el-select
-              v-model="addForm.verifyDeptCode"
-              size="small"
-              popper-class="eloption"
-              :popper-append-to-body="true"
-            >
-              <el-option
-                v-for="item in exaUser"
-                :key="item.userId"
-                :label="item.trueName"
-                :value="item.trueName"
-                @click.native="addForm.verifyUserId = item.userId"
-              >
-              </el-option>
+          <el-form-item label="审批部门：" prop="verifyDeptCode">					
+				<deptSelect
+				  v-model="addForm.verifyDeptCode"
+				  @change="searchDeptNodeClick"
+				/>
             </el-select>
-            <!-- <el-input
-              v-model="addForm.verifyDeptCode"
-              v-show="false"
-            ></el-input>
-            <SelectTree
-              class="form-input"
-              ref="searchTree"
-              :options="deptList"
-              :value="addForm.verifyDeptCode"
-              :props="{
-                value: 'code',
-                label: 'name',
-                children: 'children'
-              }"
-              @getValue="verifyNodeClick"
-            /> -->
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="审批人：" prop="verifyUserName">
-            <el-select
-              v-model="addForm.verifyUserName"
-              size="small"
-              popper-class="eloption"
-              :popper-append-to-body="true"
-            >
-              <el-option
-                v-for="item in exaUser"
-                :key="item.userId"
-                :label="item.trueName"
-                :value="item.trueName"
-                @click.native="addForm.verifyUserId = item.userId"
-              >
-              </el-option>
-            </el-select>
+          <el-form-item label="审批人：" prop="executorId">
+			 <personSelect
+			   ref="executorRef"
+			   v-model="addForm.executorId"
+			   :init="false"
+			 />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="紧急程度：" prop="urgent">
-            <el-select
-              v-model="addForm.urgent"
-              size="small"
-              style="width: 100%"
-            >
-              <el-option label="普通" :value="1"></el-option>
-              <el-option label="紧急" :value="2"></el-option>
-              <el-option label="重要" :value="3"></el-option>
-            </el-select>
+			<DictSelection  dictName="紧急程度" clearable v-model="addForm.urgent">
+			</DictSelection>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -357,6 +314,10 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="执行部门：" prop="deptCode">
+				  <deptSelect
+				    v-model="addForm.deptCode"
+				    @change="deptNodeClick"
+				  />
                 <!-- <el-input v-model="infoData.deptCode" v-show="false"></el-input>
                 <SelectTree
                   class="form-input"
@@ -376,7 +337,6 @@
               <el-form-item label="执行人：" prop="workOrderExecutorId">
                 <el-select
                   v-model="infoData.workOrderExecutorId"
-                  size="small"
                   style="width: 100%"
                 >
                   <el-option
@@ -417,16 +377,13 @@
 </template>
 
 <script>
-// import repair from '@/api/maintenance/repair/repair'
-// import maintenancePlan from '@/api/maintenance/repair/maintenancePlan'
-// import { getRuleNo } from '@/utils'
-// import user from '@/api/main/user'
-// import dept from '@/api/main/dept'
-// import SelectTree from '@/components/selectTree'
-// import { imageView } from '@/utils'
-
+  import personSelect from '@/components/CommomSelect/person-select.vue';
+	import deptSelect from '@/components/CommomSelect/dept-select.vue';
 export default {
-  // components: { SelectTree },
+  components: {
+    personSelect,
+    deptSelect
+  },
   data () {
     return {
       uerList: [], // 审批人
@@ -477,14 +434,18 @@ export default {
     }
   },
   created () {
-    this._getDeptList()
-    this.getUserList()
-    // // 编辑
-    // if (this.$route.query.id) {
-    //   this._getPlanInfo()
-    // }
+
   },
   methods: {
+	//选择部门(搜索)
+	searchDeptNodeClick (info) {
+	  // 根据部门获取人员
+	  const params = { groupId: info };
+	  this.$nextTick(() => {
+		this.$refs.executorRef.getList(params);
+	  });
+	},
+		
     // 获取详情
     async _getPlanInfo () {
       const res = await maintenancePlan.planInfoDetailApi(this.$route.query.id)
@@ -653,15 +614,11 @@ export default {
     },
 
     // 选择部门(搜索)
-    searchDeptNodeClick (info) {
+    deptNodeClick (info) {
       if (info) {
-        this.infoData.deptCode = info.code
-        this.infoData.deptName = info.name
         // 根据部门获取人员
-        const params = { deptCode: info.code, status: 1 }
+        const params = { groupId: info }
         this.getUserList(params)
-      } else {
-        this.infoData.deptCode = ''
       }
     },
 

src/views/maintenance/repair/repairNotes/index.vue

@@ -127,7 +127,7 @@
             minWidth: 110
           },
           {
-            prop: 'sourceType',
+            prop: 'from',
             label: '来源',
             align: 'center',
             showOverflowTooltip: true,