From 26e922d0ea55d7a393d0861ed963a43d53be1bda Mon Sep 17 00:00:00 2001
From: tcy <1193318383@qq.com>
Date: Sun, 14 Sep 2025 11:10:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=89=E5=85=A8=E5=B7=A1=E6=A3=80):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B4=E6=94=B9=E5=8D=95=E4=BD=8D=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在安全巡检类型中新增整改单位名称字段，用于记录整改责任单位。同时优化安全巡检详情对话框的显示：
1. 为整改期限添加空值判断
2. 调整部分字段的显示格式
3. 修复班组字段显示错误问题
---
 src/api/safety/safetyInspection/types.ts      |  5 +++
 .../SafetyInspectionDetailDialog.vue          | 45 +++++++++++--------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/api/safety/safetyInspection/types.ts b/src/api/safety/safetyInspection/types.ts
index a3a68f0..f407503 100644
--- a/src/api/safety/safetyInspection/types.ts
+++ b/src/api/safety/safetyInspection/types.ts
@@ -1,4 +1,9 @@
 export interface SafetyInspectionVO {
+
+  /**
+   * 整改单位名称
+   */
+  rectificationName: string;
   /**
    * 主键ID
    */
diff --git a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
index b3b7eb1..b3be56d 100644
--- a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
+++ b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
@@ -2,35 +2,41 @@
   <!-- <el-card v-loading="loading" body-class="printMe"> -->
   <div class="w75% m-a">
     <div id="printMe" class="pos-relative">
-      <div class="resultIcon"><img :src="'../../../../../src/assets/icons/svg/' + inspectionType + '.png'" alt="" /></div>
+      <div class="resultIcon"><img :src="'../../../../../src/assets/icons/svg/' + inspectionType + '.png'" alt="" />
+      </div>
       <h2 style="text-align: center; margin-top: 5px; font-weight: bold">安全生产监督检查通知书</h2>
       <el-row>
         <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.creatorName }}</el-col>
         <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createTime }}</el-col>
       </el-row>
       <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{ currentProject?.name }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{ currentProject?.name }}
+        </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
           <dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
           <dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="检查时间" class-name="zebra">{{ safetyInspectionDetail?.checkTime }} </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.creatorName }} </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="整改人" label-class-name="white"
-          >{{ safetyInspectionDetail?.correctorName }}
+        <el-descriptions-item label-align="center" label="检查时间" class-name="zebra">{{ safetyInspectionDetail?.checkTime
+        }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.creatorName
+        }} </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="整改人" label-class-name="white">{{
+          safetyInspectionDetail?.correctorName }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
-          {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
+          <span v-if="safetyInspectionDetail?.rectificationDeadline">{{
+            dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}</span>
+          <span v-else></span>
         </el-descriptions-item>
       </el-descriptions>
       <el-descriptions border direction="vertical" size="large">
         <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
-          >{{ safetyInspectionDetail?.hiddenDanger }}
+        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">{{
+          safetyInspectionDetail?.hiddenDanger }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
           <el-space wrap>
@@ -56,11 +62,11 @@
         <el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="班组" label-class-name="white"
-          >{{ safetyInspectionDetail?.teamName }}
+        <el-descriptions-item label-align="center" label="班组" label-class-name="white">{{
+          safetyInspectionDetail?.rectificationName }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="整改日期" label-class-name="white"
-          >{{ safetyInspectionDetail?.rectificationTime }}
+        <el-descriptions-item label-align="center" label="整改日期" label-class-name="white">{{
+          safetyInspectionDetail?.rectificationTime }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
           {{ safetyInspectionDetail?.measure }}
@@ -84,14 +90,14 @@
         <el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="2" border label-width="160px" size="large">
-        <el-descriptions-item label-align="center" label="复查人" label-class-name="white"
-          >{{ safetyInspectionDetail?.creatorName }}
+        <el-descriptions-item label-align="center" label="复查人" label-class-name="white">{{
+          safetyInspectionDetail?.creatorName }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
-          >{{ safetyInspectionDetail?.reviewTime }}
+        <el-descriptions-item label-align="center" label="复查日期" label-class-name="white">{{
+          safetyInspectionDetail?.reviewTime }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
-          >{{ safetyInspectionDetail?.review }}
+        <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white">{{
+          safetyInspectionDetail?.review }}
         </el-descriptions-item>
       </el-descriptions>
     </div>
@@ -236,6 +242,7 @@ watch(
   z-index: 10;
   width: 105px;
   height: 105px;
+
   img {
     width: 105px;
   }