From b4aeada7d5ce58ad10d78e094c76851bfe712094 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 18 Jun 2025 14:10:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/repairTest/testExamine/index.vue | 62 ++++++++++------------
 src/views/stquery/backRecord.vue           |  6 +++
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/views/repairTest/testExamine/index.vue b/src/views/repairTest/testExamine/index.vue
index 1a6ca3e..12b9eaf 100644
--- a/src/views/repairTest/testExamine/index.vue
+++ b/src/views/repairTest/testExamine/index.vue
@@ -133,6 +133,7 @@
                     </span>
                 </template>
             </el-table-column>
+            <el-table-column label="审核人" align="center" prop="auditBy" show-overflow-tooltip width="120px"/>
             <el-table-column label="不通过原因" align="center" prop="remark" show-overflow-tooltip width="120px"/>
             <el-table-column label="操作" align="center" width="250px"  fixed="right">
                 <template slot-scope="scope">
@@ -419,7 +420,7 @@
         </el-dialog>
 
         <!-- 维修记录表 -->
-        <el-dialog title="维修记录表" :visible.sync="upkeepVisible" width="46%">
+        <el-dialog title="维修记录表" :visible.sync="upkeepVisible" width="50%">
             <vue-easy-print tableShow ref="printRef">
                 <div style="padding: 0 30px">
                     <h2 style="text-align: center; font-size: 33px">重庆市送变电工程有限公司</h2>
@@ -437,20 +438,23 @@
                     >
                         <!-- 第一行 -->
                         <div style="display: flex; border-bottom: 1px solid #000">
-                            <div style="text-align: center; border-right: 1px solid #000; width: 25%">设备名称</div>
-                            <div style="text-align: center; border-right: 1px solid #000; width: 29%">型号/厂家</div>
-                            <!-- <div style="text-align: center; border-right: 1px solid #000; width: 18%">编号</div> -->
+                            <div style="text-align: center; border-right: 1px solid #000; width: 20%">设备名称</div>
+                            <div style="text-align: center; border-right: 1px solid #000; width: 20%">型号</div>
+                            <div style="text-align: center; border-right: 1px solid #000; width: 20%">编号</div>
                             <div style="text-align: center; border-right: 1px solid #000; width: 10%">数量</div>
-                            <div style="text-align: center; border-right: 1px solid #000; width: 18%">主修人</div>
-                            <div style="text-align: center; width: 18%">验收人</div>
+                            <div style="text-align: center; border-right: 1px solid #000; width: 15%">主修人</div>
+                            <div style="text-align: center; width: 15%">验收人</div>
                         </div>
                         <!-- 第二行 -->
                         <div style="display: flex; border-bottom: 1px solid #000">
-                            <div style="text-align: center; border-right: 1px solid #000; width: 25%">{{
-                                upkeepObj.type || '-'
+                            <div style="text-align: center; border-right: 1px solid #000; width: 20%">{{
+                                upkeepObj.typeName || '-'
                             }}</div>
-                            <div style="text-align: center; border-right: 1px solid #000; width: 29%">{{
-                                upkeepObj.typeName
+                            <div style="text-align: center; border-right: 1px solid #000; width: 20%">{{
+                                upkeepObj.type
+                            }}</div>
+                            <div style="text-align: center; border-right: 1px solid #000; width: 20%">{{
+                                upkeepObj.maCode
                             }}</div>
                             <!-- <div
                                 style="
@@ -463,35 +467,31 @@
                                 ><span style="margin: 0 5px; font-size: 15px">{{ upkeepObj.maCode }}</span></div
                             > -->
                             <div style="text-align: center; border-right: 1px solid #000; width: 10%">{{
-                                upkeepObj.repairedNum
+                                upkeepObj.repairNum
                             }}</div>
-                            <div style="text-align: center; border-right: 1px solid #000; width: 18%">{{
-                                upkeepObj.createBy
+                            <div style="text-align: center; border-right: 1px solid #000; width: 15%">{{
+                                upkeepObj.repairer
                             }}</div>
-                            <div style="text-align: center; width: 18%">{{ upkeepObj.checkMan }}</div>
+                            <div style="text-align: center; width: 15%">{{ upkeepObj.auditBy }}</div>
                         </div>
                         <!-- 第三行 -->
                         <div style="display: flex; border-bottom: 1px solid #000">
-                            <div style="padding-left: 10px; border-right: 1px solid #000; width: 25%">使用单位</div>
-                            <div style="padding-left: 10px">{{ upkeepObj.unitName }}-{{ upkeepObj.projectName }}</div>
+                            <div style="padding-left: 10px; border-right: 1px solid #000; width: 20%">使用单位</div>
+                            <div style="padding-left: 10px"></div>
                         </div>
                         <!-- 第四行 -->
                         <div style="width: 100%; min-height: 200px; border-bottom: 1px solid #000; padding-left: 10px"
-                            >设备维修前情况: <span>{{ upkeepObj.repairRemark }}</span>
+                            >设备维修前情况: <span>{{ upkeepObj.repairRemarkBefore }}</span>
                         </div>
                         <!-- 第五行 -->
                         <div style="width: 100%; min-height: 200px; border-bottom: 1px solid #000; padding-left: 10px"
                             >技术鉴定情况:
-                            <span v-for="item in upkeepObj.records" :key="item.repairRemark"
-                                >{{ item.repairRemark ? item.repairRemark + ', ' : '' }}
-                            </span>
+                                <span>{{ upkeepObj.repairRemark }}</span>
                         </div>
                         <!-- 第六行 -->
                         <div style="width: 100%; min-height: 200px; padding-left: 10px"
                             >维修处理情况:
-                            <span v-for="item in upkeepObj.records" :key="item.repairContent"
-                                >{{ item.repairContent ? '更换' + item.repairContent + ', ' : '' }}
-                            </span>
+                                <span>{{ upkeepObj.remark }}</span>
                         </div>
                         <div
                             style="
@@ -502,7 +502,7 @@
                                 bottom: 20px;
                                 left: 0;
                             "
-                            >验收情况: {{ upkeepObj.taskStatus }}
+                            > 验收情况: {{ upkeepObj.taskStatus === 0 ? '待审核' : upkeepObj.taskStatus === 1 ? '已通过' : upkeepObj.taskStatus === 2 ? '维修驳回' : upkeepObj.taskStatus === 3 ? '报废驳回' : upkeepObj.taskStatus }}
                         </div>
                     </div>
                     <div style="text-align: end; font-size: 20px; margin: 20px 50px 50px 0">
@@ -875,20 +875,14 @@ export default {
         openUpkeep(row) {
             console.log('🚀 ~ openUpkeep ~ row:', row)
             this.upkeepVisible = true
-            if (row.taskStatus == 47) {
-                // this.upkeepObj.taskStatus = '合格'
-                this.isTaskStatus = '合格'
-            } else {
-                this.isTaskStatus = ''
-            }
-            this.getUpkeepList(row.taskId)
+            this.getUpkeepList(row.parentId)
         },
         // 获取保养记录表数据
-        async getUpkeepList(taskId) {
+        async getUpkeepList(parentId) {
             try {
-                const res = await getMaintenanceRecordsApi({ taskId })
+                const res = await getMaintenanceRecordsApi({ parentId })
                 console.log('🚀 ~ getUpkeepList ~ res:', res)
-                this.upkeepObj = { ...res.data, taskStatus: this.isTaskStatus }
+                this.upkeepObj = res.data
             } catch (error) {
                 console.log('🚀 ~ getUpkeepList ~ error:', error)
                 this.upkeepObj = {}
diff --git a/src/views/stquery/backRecord.vue b/src/views/stquery/backRecord.vue
index e051689..bdd1d02 100644
--- a/src/views/stquery/backRecord.vue
+++ b/src/views/stquery/backRecord.vue
@@ -177,6 +177,12 @@
                 prop="backNum"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+                label="损坏情况"
+                align="center"
+                prop="remark"
+                :show-overflow-tooltip="true"
+            />
             <el-table-column
                 label="退料人"
                 align="center"