From aeb85365a2b438de36010b289c9a019677f0cc38 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 22 Nov 2023 11:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparePartsApplicationRecord/index.vue     |  2 +-
 src/views/device/sparePartsLedger/index.vue   |  2 +-
 src/views/device/upkeepOrder/index.vue        | 43 +++++++++++++------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/views/device/sparePartsApplicationRecord/index.vue b/src/views/device/sparePartsApplicationRecord/index.vue
index 16a23924..05a78621 100644
--- a/src/views/device/sparePartsApplicationRecord/index.vue
+++ b/src/views/device/sparePartsApplicationRecord/index.vue
@@ -157,7 +157,7 @@
 			</el-table-column>
 			<el-table-column label="申领人" align="center" prop="applyPeople" width="80"/>
 			<!-- <el-table-column label="批准人" align="center" prop="applyApprovePeople" width="80"/> -->
-			<el-table-column label="工厂号" align="center" prop="factoryCode" />
+			<el-table-column v-if="false" label="工厂号" align="center" prop="factoryCode" />
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue
index 19452fcd..cd14813b 100644
--- a/src/views/device/sparePartsLedger/index.vue
+++ b/src/views/device/sparePartsLedger/index.vue
@@ -92,7 +92,7 @@
 			<el-table-column label="换算比例" align="center" prop="spareConversionRatio" />
 			<el-table-column label="库存上限" align="center" prop="spareInventoryFloor" />
 			<el-table-column label="库存下限" align="center" prop="spareInventoryUpper" />
-			<el-table-column label="工厂号" align="center" prop="factoryCode" />
+			<el-table-column v-if="false" label="工厂号" align="center" prop="factoryCode" />
 			<el-table-column label="创建人" align="center" prop="createBy"/>
 			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
 				<template slot-scope="scope">
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index fb0bd62b..61f5e3fe 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -976,18 +976,7 @@
           </el-tab-pane>
           <el-tab-pane label="工单信息">
             <el-row>
-              <el-col :span="16">
-                <el-form-item label="保养时间">
-                  <el-date-picker
-                    v-model="form.timeArray"
-                    type="datetimerange"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
+              <el-col :span="8">
                 <el-form-item label="工单状态">
                   <el-select v-model="form.orderStatus" placeholder="计划状态" clearable>
                     <el-option
@@ -999,6 +988,17 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="16">
+                <el-form-item label="保养时间">
+                  <el-date-picker
+                    v-model="form.timeArray"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col span="8">
@@ -1007,6 +1007,13 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col span="18">
+                <el-form-item label="保养图片">
+                  <FileUpload v-model="form.picturePath" />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-tab-pane>
         </el-tabs>
       </el-form>
@@ -1039,6 +1046,16 @@
             <el-descriptions-item label="是否停机保养">{{ workVO.order.shutDown }}</el-descriptions-item>
             <el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
             <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
+            <el-descriptions-item label="保养图片">
+              <div class="demo-image__lazy">
+                <el-empty :image-size="200" v-if="workVO.order.upkeepPictures.length == 0"></el-empty>
+                <div v-for="(url, index) in workVO.order.upkeepPictures" :key="index">
+                  <el-image
+                    :src="url"
+                  ></el-image>
+                </div>
+              </div>
+            </el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
@@ -1188,6 +1205,7 @@ export default {
           orderStart:null,
           orderEnd:null,
           planPerson:null,
+          upkeepPictures:[],
         },equ: {
           equipmentCode:null,
           equipmentName: null,
@@ -1358,6 +1376,7 @@ export default {
         personList:[],
         planTimeArray:[],
         timeArray:[],
+        picturePath: null,
       },
       // 表单校验
       rules: {}