From 8622d21629df3ed848e7a86b1af0de7899527bff Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 29 Feb 2024 11:27:37 +0800
Subject: [PATCH] =?UTF-8?q?2024-2-29=20=E8=AE=BE=E5=A4=87-=E5=A7=94?=
 =?UTF-8?q?=E5=A4=96/=E6=8A=A5=E4=BF=AE/=E7=BB=B4=E4=BF=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=88=97=E5=B0=BE=E9=83=A8=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/faultReport/index.vue        | 31 ++++++++++++-------
 src/views/device/outsourceWorkOrder/index.vue | 19 +++++++-----
 src/views/device/repairOrder/index.vue        |  7 +++--
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index e73eb46..8dad5dd 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -283,6 +283,7 @@
         align="center"
         class-name="small-padding fixed-width"
         width="180"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -366,12 +367,14 @@
                 :contentStyle="CS"
                 :label-style="LSP"
               >
-                <el-image
-                  v-for="(item, index) in urlLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
@@ -714,12 +717,14 @@
               :label-style="LSP"
             >
               <el-descriptions-item label="故障图片">
-                <el-image
-                  v-for="(item, index) in urlLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
@@ -865,6 +870,8 @@
             <el-descriptions
               :column="2"
               border
+              :contentStyle="CS"
+              :label-style="LS"
               v-if="form.repairDestination == '委外维修'"
             >
               <el-descriptions-item label="委外原因">{{
diff --git a/src/views/device/outsourceWorkOrder/index.vue b/src/views/device/outsourceWorkOrder/index.vue
index a4f0d4a..839aedf 100644
--- a/src/views/device/outsourceWorkOrder/index.vue
+++ b/src/views/device/outsourceWorkOrder/index.vue
@@ -168,6 +168,12 @@
         width="180"
         fixed
       />
+      <el-table-column label="委外状态" align="center" prop="workStatus" width="100">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.workStatus == 1">完成</el-tag>
+          <el-tag type="danger" v-else-if="scope.row.workStatus == 0">未完成</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column
         label="报修单号"
         align="center"
@@ -185,12 +191,6 @@
           {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
         </template>
       </el-table-column>
-      <el-table-column label="委外状态" align="center" prop="workStatus" width="100">
-        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.workStatus == 1">完成</el-tag>
-          <el-tag type="danger" v-else-if="scope.row.workStatus == 0">未完成</el-tag>
-        </template>
-      </el-table-column>
       <el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" width="100"/>
       <el-table-column
@@ -208,7 +208,8 @@
         label="委外单位"
         align="center"
         prop="workOutsourcingUnit"
-        width="200"
+        width="250"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="联系方式"
@@ -220,7 +221,8 @@
         label="委外原因"
         align="center"
         prop="workReason"
-        width="150"
+        width="250"
+        :show-overflow-tooltip="true"
       />
       <el-table-column label="委外费用" align="center" prop="workCost" />
       <el-table-column label="委外用时" align="center" prop="workCostTime" />
@@ -262,6 +264,7 @@
         align="center"
         class-name="small-padding fixed-width"
         width="150"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 2b46c06..4318ed4 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -396,6 +396,7 @@
         align="center"
         class-name="small-padding fixed-width"
         width="180"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -1953,7 +1954,6 @@ export default {
         }
 
         //遍历response.data.beforeRepairFiles
-        this.urlBeforeLists = null;
         if (response.data.beforeRepairFiles != null) {
           var beforeNewFiles = [];
           response.data.beforeRepairFiles.forEach((item) => {
@@ -1970,11 +1970,12 @@ export default {
             urlBeforeLists.push(item.url);
           });
           this.urlBeforeLists = urlBeforeLists;
+        }else{
+          this.urlBeforeLists = null;
         }
 
         
         //遍历response.data.afterRepairFiles
-        this.urlAfterLists = null;
         if (response.data.afterRepairFiles != null) {
           var afterNewFiles = [];
           response.data.afterRepairFiles.forEach((item) => {
@@ -1990,6 +1991,8 @@ export default {
             urlAfterLists.push(item.url);
           });
           this.urlAfterLists = urlAfterLists;
+        }else{
+          this.urlAfterLists = null;
         }
 
         //重置