From ab3e9491ec0e46a9763407c82227dc80f158aad2 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 29 Feb 2024 11:12:40 +0800
Subject: [PATCH] =?UTF-8?q?2024-2-29=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=BB=B4=E4=BF=AE-=E5=9B=BE=E7=89=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/repairOrder/index.vue        | 56 ++++++++++---------
 .../repairOrder/selectSparePartsLedger.vue    |  2 -
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 56401254..2b46c06d 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -264,6 +264,19 @@
         width="200"
         fixed
       />
+      <el-table-column
+        label="维修状态"
+        align="center"
+        prop="workStatus"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_repair_status"
+            :value="scope.row.workStatus"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="报修单号"
         align="center"
@@ -377,19 +390,6 @@
       >
       </el-table-column>
       <el-table-column label="维修费用" align="center" prop="workCost" />
-      <el-table-column
-        label="维修状态"
-        align="center"
-        prop="workStatus"
-        width="150"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.device_repair_status"
-            :value="scope.row.workStatus"
-          />
-        </template>
-      </el-table-column>
       <el-table-column label="工厂编码" align="center" prop="factoryCode" />
       <el-table-column
         label="操作"
@@ -890,8 +890,8 @@
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修前故障图片"
-                :contentStyle="CS1"
-                :label-style="LSP1"
+                :contentStyle="CS"
+                :label-style="LS_WRITE_IMG"
               >
                 <el-image
                   v-for="(item, index) in urlBeforeLists"
@@ -903,8 +903,8 @@
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修后故障图片"
-                :contentStyle="CS1"
-                :label-style="LSP1"
+                :contentStyle="CS"
+                :label-style="LS_WRITE_IMG"
               >
                 <el-image
                   v-for="(item, index) in urlAfterLists"
@@ -1251,7 +1251,7 @@
               <el-descriptions-item
                 label="维修前故障图片"
                 :contentStyle="CS"
-                :label-style="LSP"
+                :label-style="LS_VIEW_IMG"
               >
                 <el-image
                   v-for="(item, index) in urlBeforeLists"
@@ -1264,7 +1264,7 @@
               <el-descriptions-item
                 label="维修后故障图片"
                 :contentStyle="CS"
-                :label-style="LSP"
+                :label-style="LS_VIEW_IMG"
               >
                 <el-image
                   v-for="(item, index) in urlAfterLists"
@@ -1571,15 +1571,15 @@ export default {
         "text-align": "center",
         width: "250px",
       },
-      //图片表格样式
-      LSP: {
+      //图片表格样式 查看功能
+      LS_VIEW_IMG: {
         "text-align": "center",
         width: "225px",
       },
-      //图片表格样式
-      LSP1: {
+      //图片格式样式 填写功能
+      LS_WRITE_IMG: {
         "text-align": "center",
-        width: "250px",
+        width: "235px",
       },
       //故障描述
       workFaultDescOption : [],
@@ -1875,6 +1875,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        beforeRepairFiles: null,
+        afterRepairFiles: null,
         workId: null,
         orderId: null,
         orderCode: null,
@@ -1944,11 +1946,14 @@ export default {
       const workId = row.workId || this.ids;
       getRepairOrder(workId).then((response) => {
         this.form = response.data;
+
         //转成list
         if (response.data.faultType != null) {
           this.form.faultType = response.data.faultType.split(",");
         }
+
         //遍历response.data.beforeRepairFiles
+        this.urlBeforeLists = null;
         if (response.data.beforeRepairFiles != null) {
           var beforeNewFiles = [];
           response.data.beforeRepairFiles.forEach((item) => {
@@ -1967,7 +1972,9 @@ export default {
           this.urlBeforeLists = urlBeforeLists;
         }
 
+        
         //遍历response.data.afterRepairFiles
+        this.urlAfterLists = null;
         if (response.data.afterRepairFiles != null) {
           var afterNewFiles = [];
           response.data.afterRepairFiles.forEach((item) => {
@@ -2040,7 +2047,6 @@ export default {
           });
 
           this.detailList = standards;
-          console.log("111111111111", this.detailList);
         }
         if (this.form.workStatus == "1") {
           this.queryWrite = true;
diff --git a/src/views/device/repairOrder/selectSparePartsLedger.vue b/src/views/device/repairOrder/selectSparePartsLedger.vue
index f149e402..46589d78 100644
--- a/src/views/device/repairOrder/selectSparePartsLedger.vue
+++ b/src/views/device/repairOrder/selectSparePartsLedger.vue
@@ -331,8 +331,6 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      console.log("data:", this.sparePartsLedgerList);
-      console.log("选择的数据", this.$refs.multipleTable.selection);
       this.$refs.multipleTable.selection.forEach((item) => {
         if (item.spareQuantity > item.amount - item.storageAmount) {
           Message.warning(