From ab3e9491ec0e46a9763407c82227dc80f158aad2 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 29 Feb 2024 11:12:40 +0800
Subject: [PATCH 1/3] =?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 5640125..2b46c06 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 f149e40..46589d7 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(

From 8622d21629df3ed848e7a86b1af0de7899527bff Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 29 Feb 2024 11:27:37 +0800
Subject: [PATCH 2/3] =?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;
         }
 
         //重置

From 9e209f5e0433db57cd881bb46733742f5e69d24b Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 29 Feb 2024 14:43:29 +0800
Subject: [PATCH 3/3] =?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=E6=8A=A5=E8=A1=A8=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E3=80=81=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/faultReport/index.vue       | 20 ++---
 src/views/device/repairOrder/index.vue       | 33 ++++---
 src/views/device/repairOrderReport/index.vue | 90 ++++++++++++--------
 3 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 8dad5dd..ad5f60e 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -196,6 +196,16 @@
           >
         </template>
       </el-table-column>
+      <el-table-column 
+        label="处理状态" 
+        align="center"
+        prop="orderStatus" />
+      <el-table-column
+        label="报修去向"
+        align="center"
+        prop="repairDestination"
+        width="120"
+      />
       <el-table-column
         label="设备编码"
         align="center"
@@ -252,16 +262,6 @@
         prop="orderConnection"
         width="120"
       />
-      <el-table-column 
-        label="处理状态" 
-        align="center"
-        prop="orderStatus" />
-      <el-table-column
-        label="报修去向"
-        align="center"
-        prop="repairDestination"
-        width="120"
-      />
       <el-table-column
         label="创建人"
         align="center"
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 4318ed4..6edbc7a 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -894,12 +894,14 @@
                 :contentStyle="CS"
                 :label-style="LS_WRITE_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlBeforeLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlBeforeLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
             <el-descriptions :column="1" border>
               <el-descriptions-item
@@ -907,12 +909,14 @@
                 :contentStyle="CS"
                 :label-style="LS_WRITE_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlAfterLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlAfterLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
 
@@ -2288,6 +2292,11 @@ export default {
   height: 400px;
   overflow-y: auto;
 }
+
+.view_picture_body {
+  height: 300px;
+  overflow-y: auto;
+}
 </style>
 
 
diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue
index 47948bc..35ecbbf 100644
--- a/src/views/device/repairOrderReport/index.vue
+++ b/src/views/device/repairOrderReport/index.vue
@@ -204,6 +204,19 @@
           }}</el-button>
         </template>
       </el-table-column>
+      <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"
@@ -308,25 +321,8 @@
         align="center"
         prop="workCostTime"
         width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.workCostTime) }}</span>
-        </template>
-      </el-table-column>
+      ></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>
 
@@ -397,15 +393,17 @@
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修前故障图片"
-                :contentStyle="CS"
-                :label-style="LS"
+                :contentStyle="CS_IMG"
+                :label-style="LS_BEFORE_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlBeforeLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlBeforeLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
 
@@ -482,16 +480,18 @@
             <el-descriptions
               :column="1"
               border
-              :contentStyle="CS"
-              :label-style="LS"
+              :contentStyle="CS_IMG"
+              :label-style="LS_AFTER_IMG"
             >
               <el-descriptions-item label="维修后图片">
-                <el-image
-                  v-for="(item, index) in urlAfterLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlAfterLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
 
@@ -613,6 +613,18 @@ export default {
         "text-align": "center",
         width: "200px",
       },
+      //表格样式
+      CS_IMG: {
+        "text-align": "center",
+      },
+      LS_BEFORE_IMG: {
+        "text-align": "center",
+        width: "190px",
+      },
+      LS_AFTER_IMG: {
+        "text-align": "center",
+        width: "280px",
+      },
       //检查项表格数据
       detailList: [],
       //维修前照片
@@ -828,6 +840,8 @@ export default {
             urlBeforeLists.push(item.url);
           });
           this.urlBeforeLists = urlBeforeLists;
+        }else{
+          this.urlBeforeLists = null;
         }
 
         //遍历response.data.afterRepairFiles
@@ -846,6 +860,8 @@ export default {
             urlAfterLists.push(item.url);
           });
           this.urlAfterLists = urlAfterLists;
+        }else{
+          this.urlAfterList = null;
         }
 
         //重置
@@ -891,7 +907,6 @@ export default {
           });
 
           this.detailList = standards;
-          console.log("111111111111", this.detailList);
         }
 
         //展示
@@ -972,5 +987,10 @@ export default {
   height: 400px;
   overflow-y: auto;
 }
+
+.view_picture_body {
+  height: 300px;
+  overflow-y: auto;
+}
 </style>