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

src/enum/dict.js

@@ -13,5 +13,6 @@ export default {
   规则状态: 'rule_status',
   规则周期: 'rule_cycle',
   运维计划状态: 'plan_status',
-  紧急程度: 'urgent_type'
+  紧急程度: 'urgent_type',
+  委外单状态: 'extrinsic_state'
 };

src/views/maintenance/repair/outsourcingOrder/components/order-search.vue

@@ -1,17 +1,43 @@
 <!-- 搜索表单 -->
 <template>
   <el-form
-    label-width="100px"
+    label-width="50px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="来源编码:">
+        <el-form-item label="单号:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
-		<el-form-item label="报修时间:">
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="状态:">
+          <DictSelection dictName="委外单状态" clearable v-model="where.status">
+          </DictSelection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="执行人:" label-width="60px">
+           <el-select
+             v-model="where.approvalUserId"
+             size="small"
+             clearable
+             style="width: 100%"
+           	 filterable
+           >
+             <el-option
+               v-for="item in uerList"
+               :key="item.id"
+               :value="item.id"
+               :label="item.name"
+             ></el-option>
+           </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 7, md: 12 } : { span: 7 }">
+		 <el-form-item label="发布时间:"  label-width="80px">
 			<el-date-picker
 				v-model="where.time"
 				type="daterange"
@@ -20,23 +46,9 @@
 				end-placeholder="结束日期"
 				value-format="yyyy-MM-dd HH:mm:ss"
 				:default-time="['00:00:00', '23:59:59']"
-				>
+				style="width: 100%;"
+			>
 			</el-date-picker>
-		</el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="来源类型:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="报修人:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-		 <el-form-item label="状态:">
-		   <el-input clearable v-model="where.texture" placeholder="请输入" />
 		 </el-form-item>
 		<div class="ele-form-actions">
 			<el-button
@@ -60,7 +72,7 @@
 </template>
 
 <script>
-  import { login } from '@/api/login';
+   import {  getUserPage } from '@/api/system/organization';
   export default {
     data() {
       // 默认表单数据
@@ -73,7 +85,7 @@
       return {
         // 表单数据
         where: { ...defaultWhere },
-        treeData:[]
+		uerList:[]
       };
     },
     computed: {
@@ -83,6 +95,7 @@
       }
     },
     created(){
+		this.getUserList()
     },
     methods: {
       /* 搜索 */
@@ -94,7 +107,16 @@
       reset() {
         this.where = { ...this.defaultWhere };
         this.search();
-      }
+      },
+	  
+	  // 获取执行人列表
+	  async getUserList () {
+	    try {
+	      let data = {  pageNum: 1 ,size:-1 }
+	      const res = await getUserPage(data)
+	      this.uerList = res.list
+	    } catch (error) {}
+	  },
     }
   };
 </script>

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

@@ -21,26 +21,20 @@
 	       >
 	         新建
 	       </el-button>
-		   <el-button
+<!-- 		   <el-button
 		     size="small"
 		     type="primary"
 		     class="ele-btn-icon"
 		     @click="goDetail({id:12})"
 		   >
 		     详情
-		   </el-button>
+		   </el-button> -->
 	     </template>
-<!-- 	     <template v-slot:enable="{ row }">
-	       <el-switch
-	         v-model="row.enable"
-	         active-color="#13ce66"
-	         inactive-color="#ff4949"
-	         :active-value="1"
-	         :inactive-value="0"
-	         @change="changeEnable(row)"
-	       >
-	       </el-switch>
-	     </template> -->
+       <template v-slot:outsourcCode="{ row }">
+         <el-link type="primary" :underline="false" @click="goDetail(row)">
+           {{ row.outsourcCode }}
+         </el-link>
+       </template>
 	     <!-- 操作列 -->
 	     <template v-slot:action="{ row }">
 	       <el-link
@@ -49,7 +43,7 @@
 	         icon="el-icon-edit"
 	         @click="openEdit(row)"
 	       >
-	         撤回
+	         验收
 	       </el-link>
 	     </template>
 	   </ele-pro-table>
@@ -78,65 +72,71 @@
 		    fixed: 'left'
 		  },
 		  {
-		    prop: 'code',
-		    label: '计划单号',
+		    prop: 'outsourcCode',
+		    label: '工单编号',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'groupId',
-		    label: '计划名称',
+		    prop: 'repairsCode',
+		    label: '报修单号',
 		    align: 'center',
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'enable',
-		    label: '计划规则',
+		    prop: 'equiName',
+		    label: '设备名称',
 		    align: 'center',	
 		    showOverflowTooltip: true,
-		    slot: 'enable',
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'name',
-		    label: '设备分类',
+		    prop: 'equiCode',
+		    label: '设备编码',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'cycle',
-		    label: '设备性质',
+		    prop: 'outsourcUnit',
+		    label: '委外单位',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 			{
-			  prop: 'auto',
-			  label: '状态',
+			  prop: 'plannCompletionTime',
+			  label: '计划完成时间',
+			  align: 'center',	
+			  showOverflowTooltip: true,
+			  minWidth: 110
+			},
+			{
+			  prop: 'checkTime',
+			  label: '实际完成时间',
 			  align: 'center',	
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 			{
 			  prop: 'status',
-			  label: '审批人',
+			  label: '状态',
 			  align: 'center',	
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 		  {
-		    prop: 'creater',
-		    label: '创建人',
+		    prop: 'createBy',
+		    label: '发布人',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
 		    prop: 'createTime',
-		    label: '生成时间',
+		    label: '发布时间',
 		    align: 'center',
 		    showOverflowTooltip: true,
 		    minWidth: 110,
@@ -147,7 +147,7 @@
 		  {
 		    columnKey: 'action',
 		    label: '操作',
-		    width: 230,
+		    width: 80,
 		    align: 'center',
 		    resizable: false,
 		    slot: 'action',