From 6368a3afb6fe1fcf2f1fde131f691b32028ed57f Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Fri, 11 Apr 2025 18:12:32 +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

---
 .../picking/apply/component/home.vue          | 15 +++---
 .../views/repairTest/testExamine/index.vue    | 49 +++++++++++++++++--
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
index 44360e29..c412ce21 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -251,7 +251,7 @@
                             scope.row.taskStatus == 98
                         "
                         >{{
-                            scope.row.leaseApplyInfoList[0]
+                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0]
                                 .companyAuditRemark || ''
                         }}
                     </span>
@@ -261,7 +261,7 @@
                             scope.row.taskStatus == 99
                         "
                         >{{
-                            scope.row.leaseApplyInfoList[0].deptAuditRemark ||
+                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].deptAuditRemark ||
                             ''
                         }}
                     </span>
@@ -271,7 +271,7 @@
                             scope.row.taskStatus == 100
                         "
                         >{{
-                            scope.row.leaseApplyInfoList[0].directAuditRemark ||
+                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark ||
                             ''
                         }}
                     </span>
@@ -281,19 +281,19 @@
                             scope.row.taskStatus < 98
                         "
                         >{{
-                            scope.row.leaseApplyInfoList[0].directAuditRemark ||
+                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark ||
                             ''
                         }}</span
                     >
                     <span v-if="scope.row.taskStatus > 100">{{
-                        scope.row.leaseApplyInfoList[0].directAuditRemark || ''
+                        scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark || ''
                     }}</span>
-                    <!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
+                    <!-- <span v-else>{{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
                 </template>
             </el-table-column>
             <el-table-column label="备注" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
-                    {{ scope.row.leaseApplyInfoList[0].remark || '' }}
+                    {{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].remark || '' }}
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="180">
@@ -460,6 +460,7 @@ export default {
             }
 
             const res = await getLeaseAuditListAll(params)
+            console.log('🚀 ~ getList ~ res:', res)
             res.data.rows.forEach(item => {
               switch (item.typeId) {
                 case '0':
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index 656f20bb..b98397dd 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -481,6 +481,47 @@
             width="1200px"
         >
             <el-table :data="repairRecordList" height="450px">
+                <el-table-column type="expand">
+                    <template slot-scope="scope">
+                        <el-table :data="scope.row.repairPartList" style="width: 100%">
+                            <el-table-column
+                                label="维修内容"
+                                align="center"
+                                prop="repairContent"
+                                :show-overflow-tooltip="true"
+                            />
+                            <el-table-column
+                                label="配件名称"
+                                align="center"
+                                prop="partName"
+                                :show-overflow-tooltip="true"
+                            />
+                            <el-table-column
+                                label="配件数量"
+                                align="center"
+                                prop="partNum"
+                                :show-overflow-tooltip="true"
+                            />
+                            <el-table-column
+                                label="配件单价"
+                                align="center"
+                                prop="partPrice"
+                                :show-overflow-tooltip="true"
+                            />
+                            <el-table-column
+                                label="类型"
+                                align="center"
+                                prop="partType"
+                                :show-overflow-tooltip="true"
+                            >
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.partType == '0'">不收费</span>
+                                    <span v-if="scope.row.partType == '1'">收费</span>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="序号"
                     align="center"
@@ -495,12 +536,12 @@
                         }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                     label="维修内容"
                     align="center"
                     prop="repairContent"
                     :show-overflow-tooltip="true"
-                />
+                /> -->
                 <el-table-column
                     label="维修数量"
                     align="center"
@@ -554,7 +595,7 @@
                         <span v-if="scope.row.scrapType == '1'">人为报废</span>
                     </template>
                 </el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                     label="配件名称"
                     align="center"
                     prop="partName"
@@ -582,7 +623,7 @@
                         <span v-if="scope.row.partType == '0'">不收费</span>
                         <span v-if="scope.row.partType == '1'">收费</span>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
             </el-table>
             <pagination
                 v-show="repairRecordTotal > 0"