From c791c8ae15ad3cf6390771a4d2f0e4258350bb05 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 23 Oct 2025 17:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/repair/testRecord/index.vue      | 52 +++++++++++++------
 .../equipment/equipmentRecord/index.vue       |  4 +-
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/views/material/repair/testRecord/index.vue b/src/views/material/repair/testRecord/index.vue
index b5742843..e0b2f26d 100644
--- a/src/views/material/repair/testRecord/index.vue
+++ b/src/views/material/repair/testRecord/index.vue
@@ -119,11 +119,11 @@
                     </div>
           </div>
 
-          <div style="border: 3px solid #000; min-height: 900px; line-height: 3; position: relative">
+          <div style="border: 3px solid #000; min-height: 690px; line-height: 3; position: relative">
             <div style="font-weight: 800; border-bottom: 1px solid #888; display: flex">
               <div style="width: 100%; padding-left: 10px;text-align: center">{{this.printInfo.typeName }}</div>
             </div>
-            <div v-for="(group, groupIndex) in groupPrintData" :key="groupIndex" style="display: flex; border-bottom: 1px solid #000;">
+            <div v-for="(group, groupIndex) in groupPrintData" :key="groupIndex" style="display: flex; border-bottom: 1px solid #000">
               <!-- 遍历分组中的每个元素，每个元素生成 name 和 status 两个表格 -->
               <div v-for="(row, index) in group" :key="index" style="flex: 1; display: flex; border-right: 1px solid #000;">
                 <div style="flex: 1; text-align: center; border-right: 1px solid #000; padding: 3px;">
@@ -136,23 +136,23 @@
             </div>
           <div style="position: absolute; bottom: 0; width: 100%;">
             <div style="font-weight: 800; border-bottom: 1px solid #888;border-top: 1px solid #888; display: flex">
+              <div style="width: 20%; text-align: center;border-right: 1px solid #888;">其他</div>
+              <div style="width: 80%; text-align: center; display: flex; justify-content: space-between; ">
+                <span style="margin-left: 25px;">{{otherData}}</span>
+              </div>
+            </div>
+            <div style="font-weight: 800; border-bottom: 1px solid #888; display: flex">
               <div style="width: 20%; text-align: center;border-right: 1px solid #888;">空载试验</div>
               <div style="width: 80%; text-align: center; display: flex; justify-content: space-between; ">
-                <!-- <span style="margin-left: 10px;">维修提交合格<span style="letter-spacing: 2em;">（    ）</span></span>
-                <span>维修提交报废<span style="letter-spacing: 2em;">（    ）</span></span> -->
-                <span style="margin-left: 10px;">维修提交合格<span :style="{ letterSpacing: printInfo && printInfo.scrapNum === 0 ? '0.9em' : '2em' }">（
-                  <!-- 当 scrapNum 等于 0 时显示打勾图片 -->
-                  <img v-if="printInfo && printInfo.scrapNum === 0" src="../../../../assets/img/yes.png" alt="√" style="vertical-align: middle; height: 1em; margin: 0 1.0em 0 0; display: inline-block;"/>
-                ）</span></span>
-                <span>维修提交报废<span :style="{ letterSpacing: printInfo && printInfo.scrapNum > 0 ? '1.0em' : '2em' }">（
-                  <!-- 当 scrapNum 大于 0 时显示打勾图片 -->
-                  <img v-if="printInfo && printInfo.scrapNum > 0" src="../../../../assets/img/yes.png" alt="√" style="vertical-align: middle; height: 1em; margin: 0 1.0em 0 0; display: inline-block;"/>
+                <span style="margin-left: 25px;">合格<span style="letter-spacing: 1.5em;">（<img v-if="printInfo && printInfo.scrapNum === 0" src="../../../../assets/img/yes.png" alt="√" style="vertical-align: middle; height: 1em; margin: 0 1.2em 0 0; display: inline-block;"/>）</span></span>
+                <span style="margin-right: 200px;">不合格<span :style="{ letterSpacing: printInfo && printInfo.scrapNum > 0 ? '1.0em' : '2em' }">（
+                  <img v-if="printInfo && printInfo.scrapNum > 0" src="../../../../assets/img/yes.png" alt="√" style="vertical-align: middle; height: 1em; margin: 0 1.2em 0 0; display: inline-block;"/>
                 ）</span></span>
               </div>
             </div>
 
             <div style="font-weight: 800; border-bottom: 1px solid #888; display: flex">
-              <div style="width: 20%; text-align: center;border-right: 1px solid #888;">标识等</div>
+              <div style="width: 20%; text-align: center;border-right: 1px solid #888;">标识是否齐全</div>
               <div style="width: 80%; text-align: center; display: flex; justify-content: space-between;">
                 <span style="margin-left: 10px;">二维码<span style="letter-spacing: 1.5em;">（<img src="../../../../assets/img/yes.png" alt="√" style="vertical-align: middle; height: 1em; margin: 0 1.2em 0 0; display: inline-block;"/>）</span></span>
                 <span>铭牌<span style="letter-spacing: 1.5em;">（<img src="../../../../assets/img/yes.png" alt="√" style="vertical-align: middle; height: 1em; margin: 0 1.2em 0 0; display: inline-block;"/>）</span></span>
@@ -165,7 +165,7 @@
                 <!-- 第一行：试验记录标题 -->
                 <div style="display: flex; border-bottom: 1px solid #888;height: 40px;">
                   <div style="flex: 1; text-align: center; border-right: 1px solid #888;">额定负载</div>
-                  <div style="flex: 1; text-align: center; border-right: 1px solid #888;">试验负载(T/MPa)</div>
+                  <div style="flex: 1; text-align: center; border-right: 1px solid #888;">试验负载(t/MPa)</div>
                   <div style="flex: 1; text-align: center;">持荷时间(分/秒)</div>
                 </div>
                 <!-- 第二行：试验记录结果 -->
@@ -184,7 +184,7 @@
                 <div style="display: flex;height: 40px;">
                   <div style="flex: 1; text-align: center; border-right: 1px solid #888;">{{ formatDate(printInfo.createTime) }}</div>
                   <div style="flex: 1; text-align: center; border-right: 1px solid #888;">{{ this.printInfo.repairer }}</div>
-                  <div style="flex: 1; text-align: center;">{{  this.printInfo.userName }}</div>
+                  <div style="flex: 1; text-align: center;">{{  this.printInfo.repairer }}</div>
                 </div>
               </div>
               <!-- 右边部分，占三分之一 -->
@@ -256,6 +256,7 @@ import {
 } from '@/api/back/index.js'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import printJS from 'print-js'
 export default {
     name: 'TestRecord',
     dicts: [],
@@ -302,6 +303,8 @@ export default {
             },
             dialogVisible: false, // 弹框显示
             printTableData: [], 
+            printOtherData: [],
+            otherData: "", //其他
             printInfo:{},
             testResult1: '',
             testResult2: '',
@@ -452,18 +455,20 @@ export default {
         async handleRecord(row){
         this.dialogVisible = true;
         this.printTableData = [];
+        this.printOtherData = [];
+        this.otherData = "";
         let param  = {
             id:row.id,
         }
         const res = await getTestRecordDetails(param)
         this.printInfo = res.data[0]
         if(this.printInfo && this.printInfo.ratedLoad) {
-            this.testResult1 = this.printInfo.ratedLoad + '(T/MPa)'
+            this.testResult1 = this.printInfo.ratedLoad + '(t/MPa)'
         } else {
             this.testResult1 = ''
         }
         if(this.printInfo && this.printInfo.testLoad) {
-            this.testResult2 = this.printInfo.testLoad + '(T/MPa)'
+            this.testResult2 = this.printInfo.testLoad + '(t/MPa)'
         } else {
             this.testResult2 = ''
         }
@@ -474,8 +479,19 @@ export default {
         }
         if(res.data[0].partTypeList&& res.data[0].partTypeList.length != 0){
             res.data[0].partTypeList.forEach((e) => {
-            this.printTableData.push({'partName':e.partName,'status':'不合格更换'})
+              if(e.isSure == 1 && e.isShow == 1){
+                this.printTableData.push({'partName':e.partName,'status':'更换'})
+              }else if(e.isSure == 1 && e.isShow == 0){
+                this.printTableData.push({'partName':e.partName,'status':'合格'})
+              }else if(e.isSure == 0 && e.isShow == 0){
+                this.printOtherData.push({'partName':e.partName,'status':''})
+                this.otherData =  this.otherData + e.partName + '、'
+              }
             })
+              // 去除最后一个逗号
+              if(this.otherData.length > 0){
+                this.otherData = this.otherData.substring(0, this.otherData.length - 1)
+              }
         }
         },
 
@@ -499,6 +515,8 @@ export default {
             this.dialogVisible = false; // 关闭弹框
             this.printInfo = {}; // 清空数据
             this.printTableData = []; // 清空表格数据
+            this.printOtherData = []; // 清空表格数据
+            this.otherData = ""; // 清空表格数据
             this.testResult1 = '';
             this.testResult2 = '';
             this.testResult3 = '';
diff --git a/src/views/materialsStation/equipment/equipmentRecord/index.vue b/src/views/materialsStation/equipment/equipmentRecord/index.vue
index 44370967..f73f3e6a 100644
--- a/src/views/materialsStation/equipment/equipmentRecord/index.vue
+++ b/src/views/materialsStation/equipment/equipmentRecord/index.vue
@@ -204,10 +204,10 @@
           <div class="tip-text">投入费用（万元）</div>
         </div>
 
-        <div class="tip-box">
+        <!-- <div class="tip-box">
           <div class="tip-num">¥ {{ tipForm.rentPrice || 0 }}</div>
           <div class="tip-text">租赁费用（万元）</div>
-        </div>
+        </div> -->
 
         <!-- <div class="tip-box">
           <div class="tip-num">{{ tipForm.countNum || 0 }}</div>