From ea7bde5dd944794675e1c87c5da2d622b9567970 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 10 Nov 2023 13:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E9=80=BB=E8=BE=91=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/spotCheckPlan/index.vue      |  2 +-
 .../device/spotInspectionOrder/index.vue      | 21 ++++++++++++-------
 src/views/device/spotInspectionWork/index.vue | 18 ++++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 49738f1..f00fed6 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -413,7 +413,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span=12 :offset="1">
-                <el-form-item label-width="100px" label="点检执行时间">
+                <el-form-item label-width="100px" label="点检开始时间">
                   <el-date-picker
                     @change="changeArray"
                     v-model="form.planTimeArray"
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 18c0627..30da65e 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -345,11 +345,11 @@
             <el-descriptions title="">
               <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>
+              <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}</el-descriptions-item>
               <el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item>
               <el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item>
               <el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item>
+              <el-descriptions-item v-if="this.form.repairCode != null && this.form.repairCode != '' " label="报修单">{{ this.form.repairCode }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
@@ -381,8 +381,8 @@
                     </el-col>
                     <el-col :span="9">
                       <el-form-item label="是否达标:">
-                        <el-radio v-model="standard.detailReach" label="0">达标</el-radio>
-                        <el-radio v-model="standard.detailReach" label="1">未达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="0">未达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -424,7 +424,7 @@
           <el-tab-pane label="工单信息修改">
             <el-row>
               <el-col :span="16">
-                <el-form-item label="巡检时间">
+                <el-form-item label="点检时间">
                   <el-date-picker
                     v-model="form.timeArray"
                     type="datetimerange"
@@ -621,6 +621,9 @@ export default {
         this.form = response.data;
         console.log("这里是回显信息")
         console.log(response.data)
+        if (response.data.timeArray[0] == null) {
+          response.data.timeArray = [];
+        }
         this.open = true;
         this.title = "填写记录";
       });
@@ -631,9 +634,11 @@ export default {
 				if (valid) {
 					if (this.form.orderId != null) {
             updateDeviceOrder(this.form).then(response => {
-              this.$modal.msgSuccess("提交成功");
-              this.open = false;
-              this.getList();
+              if (response.code != 500) {
+                this.$modal.msgSuccess("提交成功");
+                this.open = false;
+                this.getList();
+              }
             });
 					} else {
 						addSpotInspectionOrder(this.form).then(response => {
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 46fa246..9fb9a06 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -248,29 +248,29 @@
     <el-table @cell-click="showWork" v-loading="loading" :data="inspectionWorkList">
       <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 label="计划编码" align="center" prop="planCode" />
+      <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
       <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
-      <el-table-column label="单号" align="center" prop="orderCode" />
+      <el-table-column width="150" label="单号" align="center" prop="orderCode" />
       <el-table-column label="车间" align="center" prop="planWorkshop" />
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
-      <el-table-column label="循环周期类型" align="center" prop="planLoopType" />
-      <el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
+      <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" />
+      <el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
+      <el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="实际开始时间" align="center" prop="orderStart" width="180">
+      <el-table-column label="实际开始时间" align="center" prop="orderStart" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="实际结束时间" align="center" prop="orderEnd" width="180">
+      <el-table-column label="实际结束时间" align="center" prop="orderEnd" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
         </template>
@@ -291,13 +291,13 @@
       <el-table-column v-if="false" label="备用字段3" align="center" prop="attr3" />
       <el-table-column v-if="false" label="删除标志" align="center" prop="delFlag" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>