From cd4dbf06eb51ad41962647821db9e1cbfc8caa01 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 21 Nov 2023 10:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue        | 13 +++++--
 src/views/device/inspectionPlan/index.vue     | 38 +++++++++----------
 src/views/device/spotCheckPlan/index.vue      | 17 ++++-----
 .../device/spotInspectionOrder/index.vue      |  7 +++-
 src/views/device/upkeepOrder/index.vue        |  9 ++++-
 5 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index f3bf73c..85ea3c1 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -424,11 +424,11 @@
     />
 
     <!-- 添加或修改计划工单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-tabs type="border-card">
           <el-tab-pane label="基础信息">
-            <el-descriptions title="">
+            <el-descriptions title="" border>
               <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
               <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
               <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}
@@ -444,14 +444,16 @@
               border
               style="width: 100%">
               <el-table-column
+                width="180"
                 prop="itemName"
                 label="检查项"
-                >
+              >
               </el-table-column>
               <el-table-column
+                width="180"
                 prop="standardName"
                 label="标准名称"
-                >
+              >
               </el-table-column>
               <el-table-column
                 prop="detailReach"
@@ -468,10 +470,12 @@
                 </template>
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailUpLimit"
                 label="上限">
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailDownLimit"
                 label="下限">
               </el-table-column>
@@ -483,6 +487,7 @@
                 </template>
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index feaa87d..1b76d92 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -377,12 +377,12 @@
           <!-- 巡检计划基本信息 -->
           <div class="my-step-body" v-if="inspectionPlanStep==0">
             <el-row>
-              <el-col :span="8">
+              <el-col :span="8" offset="2">
                 <el-form-item label="计划名称">
                   <el-input v-model="form.planName" placeholder="请输入计划名称"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="6" :offset="1">
+              <el-col :span="6" :offset="2">
                 <el-form-item label="循环周期">
                   <el-input v-model="form.planLoop" placeholder="请输入循环周期"/>
                 </el-form-item>
@@ -399,8 +399,8 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="6">
-                <el-form-item label-width="100px" label="计划状态">
+              <el-col :span="8" offset="2">
+                <el-form-item label="计划状态">
                   <el-select v-model="form.planStatus" placeholder="计划状态" clearable>
                     <el-option
                       v-for="dict in dict.type.sys_normal_disable"
@@ -411,21 +411,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span=12 :offset="1">
-                <el-form-item label-width="100px" label="循环时间范围">
-                  <el-date-picker
-                    @change="changeArray"
-                    v-model="form.planTimeArray"
-                    type="datetimerange"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
+              <el-col :span="8" offset="2">
                 <el-form-item label="车间">
                   <el-select @change="changeCenter" v-model="form.planWorkshop" placeholder="请选择车间" clearable>
                     <el-option
@@ -438,6 +424,20 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span=12 :offset="2">
+                <el-form-item label-width="100px" label="循环时间范围">
+                  <el-date-picker
+                    @change="changeArray"
+                    v-model="form.planTimeArray"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </div>
           <!-- 选择设备、巡检项目 -->
           <div class="my-step-body" v-if="inspectionPlanStep==1">
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 6e49ee8..a91052e 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -297,7 +297,7 @@
 			<el-table-column v-if="false" label="主键" align="center" prop="planId" />
       <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
 			<el-table-column width="120" label="计划编码" align="center" prop="planCode" />
-			<el-table-column width="120" label="计划名称" align="center" prop="planName" />
+			<el-table-column width="200" label="计划名称" align="center" prop="planName" />
 			<el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
 			<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
@@ -384,9 +384,6 @@
 		<!-- 添加或修改点检计划对话框 -->
 		<el-dialog v-loading="planLoading" :title="title" :visible.sync="open" width="900px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item v-if="false" label="计划编码" prop="planCode">
-					<el-input v-model="form.planCode" placeholder="请输入计划编码" />
-				</el-form-item>
         <div class="my-step-mar">
           <el-steps :active="spotCheckStep" finish-status="success" align-center>
             <el-step title="点检计划基本信息"></el-step>
@@ -396,12 +393,12 @@
           <!-- 点检计划基本信息 -->
           <div class="my-step-body" v-if="spotCheckStep==0">
             <el-row>
-              <el-col :span="8">
+              <el-col :span="8" :offset="2">
                 <el-form-item label="计划名称">
                   <el-input v-model="form.planName" placeholder="请输入计划名称"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="6" :offset="1">
+              <el-col :span="6" :offset="2">
                 <el-form-item label="循环周期">
                   <el-input v-model="form.planLoop" placeholder="请输入循环周期"/>
                 </el-form-item>
@@ -418,8 +415,8 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="6">
-                <el-form-item label-width="100px" label="计划状态">
+              <el-col :span="8" :offset="2">
+                <el-form-item label="计划状态">
                   <el-select v-model="form.planStatus" placeholder="计划状态" clearable>
                     <el-option
                       v-for="dict in dict.type.sys_normal_disable"
@@ -430,7 +427,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="9" :offset="2">
+              <el-col :span="8" :offset="1">
                 <el-form-item label-width="100px" label="点检开始时间">
                   <el-date-picker
                     v-model="form.planLoopStart"
@@ -450,7 +447,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="8">
+              <el-col :span="8" offset="2" >
                 <el-form-item label="车间">
                   <el-select @change="changeCenter" v-model="form.planWorkshop" placeholder="请选择车间" clearable>
                     <el-option
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index a4c1899..55d642a 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -419,7 +419,7 @@
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-tabs type="border-card">
           <el-tab-pane label="基础信息">
-            <el-descriptions title="">
+            <el-descriptions title="" border>
               <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
               <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
               <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}</el-descriptions-item>
@@ -435,11 +435,13 @@
               border
               style="width: 100%">
               <el-table-column
+                width="180"
                 prop="itemName"
                 label="检查项"
               >
               </el-table-column>
               <el-table-column
+                width="180"
                 prop="standardName"
                 label="标准名称"
               >
@@ -459,10 +461,12 @@
                 </template>
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailUpLimit"
                 label="上限">
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailDownLimit"
                 label="下限">
               </el-table-column>
@@ -474,6 +478,7 @@
                 </template>
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 4a6f5fb..52412c5 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -862,11 +862,11 @@
     </el-dialog>
 
     <!-- 添加或修改保养工单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-tabs type="border-card">
           <el-tab-pane label="基础信息">
-            <el-descriptions title="">
+            <el-descriptions title="" border>
               <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
               <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
               <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}
@@ -882,11 +882,13 @@
               border
               style="width: 100%">
               <el-table-column
+                width="180"
                 prop="itemName"
                 label="检查项"
               >
               </el-table-column>
               <el-table-column
+                width="180"
                 prop="standardName"
                 label="标准名称"
               >
@@ -906,10 +908,12 @@
                 </template>
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailUpLimit"
                 label="上限">
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailDownLimit"
                 label="下限">
               </el-table-column>
@@ -921,6 +925,7 @@
                 </template>
               </el-table-column>
               <el-table-column
+                width="80"
                 prop="detailUnit"
                 label="单位">
               </el-table-column>