运维模块修改

src/views/maintenance/equipment/work/index.vue

@@ -21,29 +21,39 @@
 		     详情
 		   </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:action="{ row }">
+				 <el-link
+					 type="primary"
+					 :underline="false"
+					 icon="el-icon-edit"
+					 >
+					 报工
+				 </el-link>
+				 <el-link
+					 type="primary"
+					 :underline="false"
+					 icon="el-icon-edit"
+					@click="toRedeploy(row)"
+				 >
+					转派
+				 </el-link>
+			 </template>
 	   </ele-pro-table>
      </el-card>
-	 
+	 <!-- 转派弹窗 -->
+	 <redeployOther ref="redeployOtherRef" @refresh="reload" />
   </div>
 </template>
 
 <script>
   import WorkSearch from './components/work-search.vue';
   import { pageRoles } from '@/api/system/role'; 
+  import redeployOther from '@/views/maintenance/components/redeployOther.vue';
   export default {
     components: {
-      WorkSearch
+      WorkSearch,
+	  redeployOther
     },
     data () {
       return {
@@ -66,68 +76,76 @@
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'enable',
-		    label: '状态',
+		    prop: 'planCode',
+		    label: '计划单号',
 		    align: 'center',	
 		    showOverflowTooltip: true,
-		    slot: 'enable',
+		    slot: 'planCode',
 		    minWidth: 110
 		  },
 			{
-			  prop: 'groupId',
-			  label: '计划单号',
+			  prop: 'planName',
+			  label: '保养名称',
 			  align: 'center',
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 		  {
-		    prop: 'name',
-		    label: '保养名称',
-		    align: 'center',	
-		    showOverflowTooltip: true,
-		    minWidth: 110
-		  },
-		  {
-		    prop: 'cycle',
+		    prop: 'executorDeptName',
 		    label: '保养部门',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 			{
-			  prop: 'auto',
+			  prop: 'executeUserName',
 			  label: '保养人员',
 			  align: 'center',	
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 			{
-			  prop: 'status',
-			  label: '工单执行时长',
+			  prop: 'acceptTime',
+			  label: '开工时间',
 			  align: 'center',	
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 		  {
-		    prop: 'creater',
-		    label: '设备分类',
+		    prop: 'finishTime',
+		    label: '报工时间',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'createTime',
-		    label: '规则名称',
+		    prop: 'sj',
+		    label: '时间工时',
+		    align: 'center',	
+		    showOverflowTooltip: true,
+		    minWidth: 110
+		  },
+		  {
+		    prop: 'status',
+		    label: '状态',
+		    align: 'center',
+		    showOverflowTooltip: true,
+		    minWidth: 110
+		  },
+		  {
+		    prop: 'executeResult',
+		    label: '执行结果',
 		    align: 'center',
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
 		    columnKey: 'action',
-		    label: '创建人',
-		    width: 230,
+		    label: '操作',
+		    width: 150,
 		    align: 'center',
 		    resizable: false,
+		    slot: 'action',
 		    showOverflowTooltip: true
 		  }
 		],
@@ -170,7 +188,10 @@
 		    //   id
 		    // }
 		  })
-	  }
+	  },
+	  toRedeploy(row) {
+	    this.$refs.redeployOtherRef.open(row);
+	  },
 	  
     }
   };

src/views/maintenance/patrol/work/index.vue

@@ -21,29 +21,39 @@
 		     详情
 		   </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:action="{ row }">
+				   <el-link
+					 type="primary"
+					 :underline="false"
+					 icon="el-icon-edit"
+				   >
+					 报工
+				   </el-link>
+				 <el-link
+					 type="primary"
+					 :underline="false"
+					 icon="el-icon-edit"
+					  @click="toRedeploy(row)"
+				 >
+					转派
+				 </el-link>
+			 </template>
 	   </ele-pro-table>
      </el-card>
-	 
+	   <!-- 转派弹窗 -->
+	   <redeployOther ref="redeployOtherRef" @refresh="reload" />
   </div>
 </template>
 
 <script>
   import WorkSearch from './components/work-search.vue';
   import { pageRoles } from '@/api/system/role'; 
+	import redeployOther from '@/views/maintenance/components/redeployOther.vue';
   export default {
     components: {
-      WorkSearch
+      WorkSearch,
+	  redeployOther
     },
     data () {
       return {
@@ -72,14 +82,6 @@
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
-		  {
-		    prop: 'enable',
-		    label: '状态',
-		    align: 'center',	
-		    showOverflowTooltip: true,
-		    slot: 'enable',
-		    minWidth: 110
-		  },
 		  {
 		    prop: 'name',
 		    label: '巡点检名称',
@@ -103,32 +105,56 @@
 			},
 			{
 			  prop: 'status',
-			  label: '工单执行时长',
+			  label: '工单生成时间',
 			  align: 'center',	
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 		  {
 		    prop: 'creater',
-		    label: '设备分类',
+		    label: '开工时间',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
 		    prop: 'createTime',
-		    label: '规则名称',
+		    label: '报工时间',
 		    align: 'center',
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    columnKey: 'action',
-		    label: '创建人',
+		    columnKey: 'createBy',
+		    label: '实际工时',
 		    width: 230,
 		    align: 'center',
 		    resizable: false,
 		    showOverflowTooltip: true
+		  },
+		  {
+		    prop: 'enable',
+		    label: '状态',
+		    align: 'center',	
+		    showOverflowTooltip: true,
+		    slot: 'enable',
+		    minWidth: 110
+		  },
+		  {
+		    prop: 'result',
+		    label: '执行结果',
+		    align: 'center',	
+		    showOverflowTooltip: true,
+		    minWidth: 110
+		  },
+		  {
+		    columnKey: 'action',
+		    label: '操作',
+		    width: 150,
+		    align: 'center',
+		    resizable: false,
+		    slot: 'action',
+		    showOverflowTooltip: true
 		  }
 		],
         // 加载状态
@@ -163,14 +189,18 @@
       },
 	  
 	  
-	  goDetail(){
-		  this.$router.push({
-		    path: '/maintenance/patrol/work/details',
-		    // query: {
-		    //   id
-		    // }
-		  })
-	  }
+		goDetail(){
+			this.$router.push({
+				path: '/maintenance/patrol/work/details',
+				// query: {
+				//   id
+				// }
+			})
+		},
+		// 转派
+		toRedeploy(row) {
+		  this.$refs.redeployOtherRef.open(row);
+		},
 	  
     }
   };

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

@@ -59,7 +59,7 @@
 <script>
   import WorkorderSearch from './components/workorder-search.vue';
   import RepairDetailsDialog from '../components/RepairDetailsDialog.vue';
-  import redeployOther from '../components/redeployOther.vue';
+  import redeployOther from '@/views/maintenance/components/redeployOther.vue';
   import { pageRoles } from '@/api/system/role'; 
   export default {
     components: {
@@ -81,69 +81,82 @@
 		    fixed: 'left'
 		  },
 		  {
-		    prop: 'code',
+		    prop: 'workOrderCode',
 		    label: '工单编号',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'groupId',
+		    prop: 'planCode',
 		    label: '计划单号',
 		    align: 'center',
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'enable',
+		    prop: 'planName',
 		    label: '计划名称',
 		    align: 'center',	
 		    showOverflowTooltip: true,
-		    slot: 'enable',
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'name',
+		    prop: 'equiCode',
 		    label: '设备编号',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'cycle',
+		    prop: 'equiName',
 		    label: '设备名称',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 			{
-			  prop: 'auto',
+			  prop: 'executeUserName',
 			  label: '执行人',
 			  align: 'center',	
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 			{
-			  prop: 'status',
+			  prop: 'planFinishTime',
 			  label: '计划完成时间',
 			  align: 'center',	
 			  showOverflowTooltip: true,
 			  minWidth: 110
 			},
 		  {
-		    prop: 'creater',
-		    label: '实际完成时间',
+		    prop: 'acceptTime',
+		    label: '开工时间',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'createTime',
-		    label: '状态',
+		    prop: 'finishTime',
+		    label: '报工时间',
 		    align: 'center',
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
+			{
+			  prop: 'sj',
+			  label: '实际工时',
+			  align: 'center',
+			  showOverflowTooltip: true,
+			  minWidth: 110
+			},
+			{
+			  prop: 'status',
+			  label: '状态',
+			  align: 'center',
+			  showOverflowTooltip: true,
+			  minWidth: 110
+			},
 			{
 			  columnKey: 'action',
 			  label: '操作',