From 304c1bdb23593e72da0e9e98d81a0a0704dd0f23 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 10 Jan 2024 11:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=92=E7=89=88=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue        | 27 +++++++++++++++----
 src/views/device/inspectionPlan/index.vue     |  6 ++---
 src/views/device/inspectionWork/index.vue     | 20 +++++++++-----
 src/views/device/item/index.vue               | 10 +++----
 src/views/device/maintenanceWork/index.vue    | 23 ++++++++--------
 src/views/device/spotCheckPlan/index.vue      |  6 ++---
 .../device/spotInspectionOrder/index.vue      | 15 ++++++++---
 src/views/device/spotInspectionWork/index.vue | 20 ++++++++++----
 src/views/device/upkeepOrder/index.vue        | 22 +++++++--------
 src/views/device/upkeepPlan/index.vue         |  6 ++---
 src/views/system/dept/index.vue               |  2 +-
 11 files changed, 101 insertions(+), 56 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index fc8f099..e3af903 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -199,7 +199,7 @@
                         placeholder="请选择更新时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
+      <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -212,7 +212,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围结束" prop="planLoopEnd">
+      <el-form-item label="循环范围结束" prop="planLoopEnd">
         <el-date-picker
           v-model="queryParams.loopEndArray"
           type="daterange"
@@ -251,7 +251,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="点检人" prop="planPerson">
+      <el-form-item label="巡检人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
           placeholder="请输入点检人"
@@ -259,6 +259,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="巡检时间" prop="orderStart">
+        <el-date-picker clearable
+                        v-model="queryParams.orderStart"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择点检时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="设备编码" prop="equipmentCode">
         <el-input
           v-model="queryParams.equipmentCode"
@@ -267,6 +275,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -341,6 +357,7 @@
       </el-table-column>
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="150" label="巡检时间" align="center" prop="orderStart"/>
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
       <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
@@ -369,7 +386,7 @@
         </template>
       </el-table-column>
       <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index 98c85e8..11886dc 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -199,7 +199,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
+      <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -212,7 +212,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围结束" prop="planLoopEnd">
+      <el-form-item label="循环范围结束" prop="planLoopEnd">
         <el-date-picker
           v-model="queryParams.loopEndArray"
           type="daterange"
diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index cebbbd5..2a536cd 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -109,7 +109,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点检人" prop="planPerson">
+      <el-form-item label="巡检人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
           placeholder="请输入点检人"
@@ -117,6 +117,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="巡检时间" prop="orderStart">
+        <el-date-picker clearable
+                        v-model="queryParams.orderStart"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择点检时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item v-if="false" label="工单用时" prop="orderCostTime">
         <el-input
           v-model="queryParams.orderCostTime"
@@ -205,7 +213,7 @@
                         placeholder="请选择更新时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
+      <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -218,7 +226,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围结束" prop="planLoopEnd">
+      <el-form-item label="循环范围结束" prop="planLoopEnd">
         <el-date-picker
           v-model="queryParams.loopEndArray"
           type="daterange"
@@ -231,7 +239,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -244,7 +252,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index 990f93b..ee39906 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label-width="90px" label="检查项编码" prop="itemCode">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="检查项编码" prop="itemCode">
         <el-input
           v-model="queryParams.itemCode"
           placeholder="请输入检查项编码"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label-width="60px" label="部位" prop="itemName">
+      <el-form-item label="部位" prop="itemName">
         <el-input
           v-model="queryParams.itemName"
           placeholder="请输入部位"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label-width="120px" label="检查项方法" prop="itemMethod">
+      <el-form-item label="检查项方法" prop="itemMethod">
         <el-input
           v-model="queryParams.itemMethod"
           placeholder="请输入检查项方法"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label-width="120px" label="检查项工具" prop="itemMethod">
+      <el-form-item label="检查项工具" prop="itemMethod">
         <el-input
           v-model="queryParams.itemTools"
           placeholder="请输入检查项工具"
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index a29fc2e..bb5798d 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -117,7 +117,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点检人" prop="planPerson">
+      <el-form-item label="保养人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
           placeholder="请输入点检人"
@@ -213,7 +213,7 @@
                         placeholder="请选择更新时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
+      <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -226,7 +226,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围结束" prop="planLoopEnd">
+      <el-form-item label="循环范围结束" prop="planLoopEnd">
         <el-date-picker
           v-model="queryParams.loopEndArray"
           type="daterange"
@@ -239,7 +239,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item label="保养开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -252,7 +252,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item label="保养结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
@@ -371,18 +371,18 @@
           <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="执行开始时间" align="center" prop="orderStart">
+      <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="执行结束时间" align="center" prop="orderEnd">
+      <el-table-column width="120" label="保养结束时间" align="center" prop="orderEnd">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column width="80" label="保养类型" align="center" prop="upkeep" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
@@ -464,8 +464,8 @@
             <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
             <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
             <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
+            <el-descriptions-item label="保养开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
+            <el-descriptions-item label="保养结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
             <el-descriptions-item label="保养类型">{{ workVO.order.upkeep }}</el-descriptions-item>
             <el-descriptions-item label="是否停机保养">{{ workVO.order.shutDown }}</el-descriptions-item>
             <el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
@@ -835,6 +835,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.equipmentName = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index a2fe9fc..882dc8b 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
 			<el-form-item label="计划编码" prop="planCode">
 				<el-input
 					v-model="queryParams.planCode"
@@ -95,7 +95,7 @@
 					/>
 				</el-select>
 			</el-form-item>
-			<el-form-item label-width="90px" label="是否可生产" prop="planRestrict">
+			<el-form-item label="是否可生产" prop="planRestrict">
         <el-select v-model="queryParams.planRestrict" placeholder="请选择计划状态" clearable>
           <el-option
             v-for="dict in dict.type.device_yes_no"
@@ -206,7 +206,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环开始时间" prop="planLoopStart">
+      <el-form-item label="循环开始时间" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 724ecf9..0b7d4b9 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
 			<el-form-item v-if="false" label="计划id" prop="planId">
 				<el-input
 					v-model="queryParams.planId"
@@ -135,6 +135,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
+			<el-form-item label="点检时间" prop="orderStart">
+        <el-date-picker clearable
+                        v-model="queryParams.orderStart"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择点检时间">
+        </el-date-picker>
+			</el-form-item>
 			<el-form-item v-if="false" label="工单用时" prop="orderCostTime">
 				<el-input
 					v-model="queryParams.orderCostTime"
@@ -223,7 +231,7 @@
 					placeholder="请选择更新时间">
 				</el-date-picker>
 			</el-form-item>
-      <el-form-item label-width="100px" label="循环开始时间" prop="planLoopStart">
+      <el-form-item label="循环开始时间" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -319,7 +327,7 @@
 			<el-table-column v-if="false" label="主键" align="center" prop="orderId" />
 			<el-table-column v-if="false" label="计划id" align="center" prop="planId" />
       <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column width="150" label="计划编码" align="center" prop="planCode" />
 			<el-table-column width="150" label="计划名称" align="center" prop="planName" />
 			<el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
@@ -334,6 +342,7 @@
       </el-table-column>
 			<el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="150" label="点检时间" align="center" prop="orderStart"/>
 			<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
 			<el-table-column label="循环周期" align="center" prop="planLoop" />
 			<el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 74ce124..9ee4bf5 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -125,6 +125,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="点检时间" prop="orderStart">
+        <el-date-picker clearable
+                        v-model="queryParams.orderStart"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择点检时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item v-if="false" label="工单用时" prop="orderCostTime">
         <el-input
           v-model="queryParams.orderCostTime"
@@ -213,7 +221,7 @@
                         placeholder="请选择更新时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环开始时间" prop="planLoopStart">
+      <el-form-item label="循环开始时间" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -226,7 +234,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -239,7 +247,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
@@ -321,6 +329,7 @@
       </el-table-column>
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="150" label="点检时间" align="center" prop="orderStart"/>
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
       <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
@@ -349,7 +358,7 @@
         </template>
       </el-table-column>
       <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
@@ -733,6 +742,7 @@ export default {
       this.queryParams.loopStartArray = [];
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
+      this.queryParams.equipmentName = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index b991c90..dfadbca 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -111,7 +111,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item v-if="false" label="设备名称" prop="equipmentName">
+      <el-form-item label="设备名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
           placeholder="请输入设备名称"
@@ -223,7 +223,7 @@
                         placeholder="请选择更新时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
+      <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -236,7 +236,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围结束" prop="planLoopEnd">
+      <el-form-item label="循环范围结束" prop="planLoopEnd">
         <el-date-picker
           v-model="queryParams.loopEndArray"
           type="daterange"
@@ -249,7 +249,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item label="保养开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -262,7 +262,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item label="保养结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
@@ -369,7 +369,7 @@
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
       <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
       <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
@@ -387,12 +387,12 @@
           <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="执行开始时间" align="center" prop="orderStart">
+      <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="执行结束时间" align="center" prop="orderEnd">
+      <el-table-column width="120" label="保养结束时间" align="center" prop="orderEnd">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
         </template>
@@ -1038,8 +1038,8 @@
             <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
             <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
             <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
+            <el-descriptions-item label="保养开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
+            <el-descriptions-item label="保养结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
             <el-descriptions-item label="保养类型">{{ workVO.order.upkeep }}</el-descriptions-item>
             <el-descriptions-item label="是否停机保养">{{ workVO.order.shutDown }}</el-descriptions-item>
             <el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index 32fd2d7..6e7b20a 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -219,7 +219,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
+      <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
           type="daterange"
@@ -232,7 +232,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="循环范围结束" prop="planLoopEnd">
+      <el-form-item label="循环范围结束" prop="planLoopEnd">
         <el-date-picker
           v-model="queryParams.loopEndArray"
           type="daterange"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 746828e..d2abc3e 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -56,7 +56,7 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-    <el-table-column prop="deptId" label="部门Id" width="100"></el-table-column>
+    <el-table-column prop="deptId" label="部门Id" width="200"></el-table-column>
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">