From a2634fb4e4335dc2b39fbcd9b9a8ab69047f9de4 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Wed, 17 Sep 2025 11:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qualityInspection/index.ts    |  10 ++
 src/api/safety/safetyInspection/index.ts      |  16 ++-
 .../component/qualityInspectionDetail.vue     |  64 +++++----
 src/views/quality/qualityInspection/index.vue | 126 ++++++++++--------
 .../SafetyInspectionDetailDialog.vue          |  76 ++++++-----
 src/views/safety/safetyInspection/index.vue   | 125 ++++++++---------
 6 files changed, 235 insertions(+), 182 deletions(-)

diff --git a/src/api/quality/qualityInspection/index.ts b/src/api/quality/qualityInspection/index.ts
index 82c8a4f..22e00db 100644
--- a/src/api/quality/qualityInspection/index.ts
+++ b/src/api/quality/qualityInspection/index.ts
@@ -61,3 +61,13 @@ export const delQualityInspection = (id: string | number | Array<string | number
     method: 'delete'
   });
 };
+/**
+ * 质量-检查工单 历史列表
+ * @param id
+ */
+export const recordList = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/quality/qualityInspection/record/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/api/safety/safetyInspection/index.ts b/src/api/safety/safetyInspection/index.ts
index 8fc0707..4b28f14 100644
--- a/src/api/safety/safetyInspection/index.ts
+++ b/src/api/safety/safetyInspection/index.ts
@@ -62,7 +62,7 @@ export const delSafetyInspection = (id: string | number | Array<string | number>
   });
 };
 /**
- * 
+ *
  * 新增安全巡检工单复查
  * @param data
  */
@@ -72,7 +72,7 @@ export const addSafetyInspectionReview = (data: any) => {
     method: 'post',
     data: data
   });
-}
+};
 /**
  * 新增安全巡检工单整改
  * @param data
@@ -83,4 +83,14 @@ export const addSafetyInspectionRectification = (data: any) => {
     method: 'post',
     data: data
   });
-}
+};
+/**
+ * 新增安全巡检工单整改
+ * @param data
+ */
+export const recordList = (id: any) => {
+  return request({
+    url: '/safety/safetyInspection/record/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue b/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
index 7efd667..6deeb15 100644
--- a/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
+++ b/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
@@ -1,17 +1,24 @@
 <template>
-  <!-- <el-card v-loading="loading" body-class="printMe"> -->
   <div class="w75% m-a">
+    <el-select style="width: 300px; margin-bottom: 10px" v-model="teamId" placeholder="请选择历史版本">
+      <el-option
+        v-for="(item, i) of histroyList"
+        :key="i"
+        :label="'版本' + item.version"
+        :value="item.id"
+        @click="changeForeman(item.id)"
+      ></el-option>
+    </el-select>
     <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?.createBy }}</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">{{
-          safetyInspectionDetail?.projectName }}
+        <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra"
+          >{{ safetyInspectionDetail?.projectName }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="巡检标题" :span="2" label-class-name="white">
           {{ safetyInspectionDetail?.inspectionHeadline }}
@@ -25,22 +32,22 @@
         <el-descriptions-item label-align="center" label="巡检类型" label-class-name="white">
           <dict-tag :options="quality_inspection_check_type" :value="safetyInspectionDetail?.inspectionType" />
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="填报人" label-class-name="white">{{
-          safetyInspectionDetail?.createBy }}
+        <el-descriptions-item label-align="center" label="填报人" label-class-name="white"
+          >{{ safetyInspectionDetail?.createBy }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="填报日期" class-name="zebra">{{ safetyInspectionDetail?.createTime
-        }}
+        <el-descriptions-item label-align="center" label="填报日期" class-name="zebra"
+          >{{ safetyInspectionDetail?.createTime }}
         </el-descriptions-item>
-        <el-descriptions-item label-align="center" label="要求回复期限" class-name="zebra">{{
-          parseTime(safetyInspectionDetail?.replyPeriodDate, '{y}-{m}-{d}') }}
+        <el-descriptions-item label-align="center" label="要求回复期限" class-name="zebra"
+          >{{ parseTime(safetyInspectionDetail?.replyPeriodDate, '{y}-{m}-{d}') }}
         </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?.inspectionResult }}
+        <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
+          >{{ safetyInspectionDetail?.inspectionResult }}
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
           <el-space wrap>
@@ -57,8 +64,7 @@
           </el-space>
         </el-descriptions-item>
         <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
-          <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.inspectionStatus)"
-            finish-status="finish">
+          <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.inspectionStatus)" finish-status="finish">
             <el-step v-for="item in quality_inspection_status_type" :key="item.value" :title="item.label" />
           </el-steps>
         </el-descriptions-item>
@@ -89,8 +95,8 @@
         <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?.verificationResult }}
+        <el-descriptions-item label-align="center" label="验证结果" label-class-name="white"
+          >{{ safetyInspectionDetail?.verificationResult }}
         </el-descriptions-item>
       </el-descriptions>
     </div>
@@ -110,7 +116,7 @@
 </template>
 
 <script lang="ts" setup>
-import { getQualityInspection } from '@/api/quality/qualityInspection';
+import { getQualityInspection, recordList } from '@/api/quality/qualityInspection';
 import { QualityInspectionVO } from '@/api/quality/qualityInspection/types';
 import { downLoadOss, listByIds } from '@/api/system/oss';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -120,13 +126,22 @@ const { quality_inspection_check_type, quality_inspection_status_type } = toRefs
 );
 interface Props {
   qualityInspectionDetailId?: string | number;
+  jobKey: string;
 }
-
 const props = defineProps<Props>();
 const safetyInspectionDetail = ref<QualityInspectionVO>();
 const checkFileList = ref<any[]>();
 const rectificationFileList = ref<any[]>();
-
+const teamId = ref('');
+const histroyList = ref<any[]>();
+// 获取列表
+const getList = async () => {
+  var res = await recordList(props.jobKey);
+  histroyList.value = res.data;
+};
+const changeForeman = (id) => {
+  get(id);
+};
 //检查状态图片
 const inspectionType = computed(() => {
   let imgName = 'successLogo';
@@ -137,8 +152,8 @@ const inspectionType = computed(() => {
 });
 
 //获取详情
-const get = async () => {
-  const res = await getQualityInspection(props.qualityInspectionDetailId);
+const get = async (id) => {
+  const res = await getQualityInspection(id);
   if (res.data && res.code === 200) {
     safetyInspectionDetail.value = res.data;
 
@@ -158,7 +173,8 @@ const handleExport = async () => {
 };
 
 onMounted(() => {
-  get();
+  getList();
+  get(props.qualityInspectionDetailId);
 });
 
 watch(
@@ -167,7 +183,7 @@ watch(
     if (newId !== oldId) {
       checkFileList.value = undefined;
       //   rectificationFileList.value = undefined;
-      get();
+      get(props.qualityInspectionDetailId);
     }
   }
 );
diff --git a/src/views/quality/qualityInspection/index.vue b/src/views/quality/qualityInspection/index.vue
index 820bc08..4851906 100644
--- a/src/views/quality/qualityInspection/index.vue
+++ b/src/views/quality/qualityInspection/index.vue
@@ -1,20 +1,17 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="巡检类型" prop="inspectionType">
               <el-select v-model="queryParams.inspectionType" placeholder="全部" clearable>
-                <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="工单状态" prop="inspectionStatus">
               <el-select v-model="queryParams.inspectionStatus" placeholder="全部" clearable>
-                <el-option v-for="dict in quality_inspection_status_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in quality_inspection_status_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -30,8 +27,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"
-              v-hasPermi="['quality:qualityInspection:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['quality:qualityInspection:add']">新增</el-button>
           </el-col>
           <!-- <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['quality:qualityInspection:edit']"
@@ -39,13 +35,19 @@
             >
           </el-col> -->
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['quality:qualityInspection:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
-              v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['quality:qualityInspection:remove']"
+              >删除</el-button
+            >
           </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -96,29 +98,37 @@
                 v-hasPermi="['quality:qualityInspection:edit']"
               ></el-button>
             </el-tooltip> -->
-            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)"
-              v-hasPermi="['quality:qualityInspection:edit']">
+            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['quality:qualityInspection:edit']">
               详情
             </el-button>
-            <el-button link type="success"
-              v-if="scope.row.inspectionStatus === '1' || scope.row.verificationType === '2'" icon="Pointer"
-              @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:rectification']">
+            <el-button
+              link
+              type="success"
+              v-if="scope.row.inspectionStatus === '1' || scope.row.verificationType === '2'"
+              icon="Pointer"
+              @click="handleDialog(scope.row)"
+              v-hasPermi="['safety:safetyInspection:rectification']"
+            >
               整改
             </el-button>
-            <el-button link type="warning" icon="SuccessFilled" v-if="scope.row.inspectionStatus === '2'"
-              @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:review']">
+            <el-button
+              link
+              type="warning"
+              icon="SuccessFilled"
+              v-if="scope.row.inspectionStatus === '2'"
+              @click="handleDialog(scope.row)"
+              v-hasPermi="['safety:safetyInspection:review']"
+            >
               复查
             </el-button>
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['quality:qualityInspection:remove']">
+            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['quality:qualityInspection:remove']">
               删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改质量-检查工单对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="700px" append-to-body>
@@ -131,20 +141,23 @@
         </el-form-item>
         <el-form-item label="巡检类型" prop="inspectionType">
           <el-select v-model="form.inspectionType" placeholder="请选择巡检类型">
-            <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="整改单位" prop="rectificationUnit">
           <el-select v-model="form.rectificationUnit" placeholder="请选择整改单位">
-            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="所在班组" prop="teamId">
           <el-select v-model="form.teamId" placeholder="请选择所在班组">
-            <el-option v-for="dict in teamOpt" :key="dict.value" :label="dict.label" :value="dict.value"
-              @click="changeForeman(dict.value)"></el-option>
+            <el-option
+              v-for="dict in teamOpt"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @click="changeForeman(dict.value)"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="整改人" prop="corrector">
@@ -174,10 +187,9 @@
       </template>
     </el-dialog>
     <el-dialog title="质量工单详情" v-model="dialog.details" width="60vw">
-      <quality-inspection-detail :qualityInspectionDetailId="currentId" />
+      <quality-inspection-detail :jobKey="jobKey" :qualityInspectionDetailId="currentId" />
     </el-dialog>
-    <el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible"
-      width="500px">
+    <el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible" width="500px">
       <el-form ref="handleFormRef" :model="handleForm" :rules="rules" label-width="120px">
         <el-form-item label="整改反馈" prop="rectificationResult" v-if="handleType === 'rectification'">
           <el-input v-model="handleForm.rectificationResult" type="textarea" placeholder="请输入内容" />
@@ -190,8 +202,7 @@
         </el-form-item>
         <el-form-item label="验证类型" prop="reviewType" v-if="handleType === 'review'">
           <el-select v-model="handleForm.verificationType" placeholder="请选择复查类型">
-            <el-option v-for="dict in review_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in review_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -233,7 +244,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const handleForm = ref({})
+const handleForm = ref({});
 const isReply_type = ref([
   {
     label: '是',
@@ -247,13 +258,13 @@ const isReply_type = ref([
 
 const queryFormRef = ref<ElFormInstance>();
 const qualityInspectionFormRef = ref<ElFormInstance>();
-const handleDialogVisible = ref(false)
+const handleDialogVisible = ref(false);
 const dialog = reactive<DialogOption>({
   visible: false,
   details: false,
   title: ''
 });
-const handleType = ref("")
+const handleType = ref('');
 
 const initFormData: QualityInspectionForm = {
   id: undefined,
@@ -320,33 +331,32 @@ const getList = async () => {
 };
 const handleSubmit = async () => {
   let flag = false;
-  if (handleType.value == "rectification") {
-    handleForm.value.inspectionStatus = "2";
-    handleForm.value.rectificationTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
-    const { code } = await updateQualityInspection(handleForm.value)
-    if (code == 200) flag = true
+  if (handleType.value == 'rectification') {
+    handleForm.value.inspectionStatus = '2';
+    handleForm.value.rectificationTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
+    const { code } = await updateQualityInspection(handleForm.value);
+    if (code == 200) flag = true;
   } else {
-    handleForm.value.inspectionStatus = "3";
-    handleForm.value.verificationTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
-    const { code } = await updateQualityInspection(handleForm.value)
-    if (code == 200) flag = true
+    handleForm.value.inspectionStatus = '3';
+    handleForm.value.verificationTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
+    const { code } = await updateQualityInspection(handleForm.value);
+    if (code == 200) flag = true;
   }
   if (flag) {
-    ElMessage.success("处理成功")
+    ElMessage.success('处理成功');
     handleDialogVisible.value = false;
-    getList()
-    reset()
+    getList();
+    reset();
   } else {
-    ElMessage.error("处理失败")
+    ElMessage.error('处理失败');
   }
-
-}
+};
 const handleDialog = (row) => {
   handleForm.value = {};
   if (row.inspectionStatus == '1') {
-    handleType.value = "rectification"
+    handleType.value = 'rectification';
   } else {
-    handleType.value = "review"
+    handleType.value = 'review';
   }
   handleForm.value.id = row.id;
   handleDialogVisible.value = true;
@@ -408,9 +418,11 @@ const handleUpdate = async (row?: QualityInspectionVO) => {
 };
 
 const currentId = ref<string | number>('');
+const jobKey = ref<string | number>('');
 /** 详情按钮操作 */
-const handleDetail = async (row?: QualityInspectionVO) => {
+const handleDetail = async (row) => {
   currentId.value = row?.id;
+  jobKey.value = row?.jobKey;
   dialog.details = true;
 };
 
diff --git a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
index b3be56d..ad6de4c 100644
--- a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
+++ b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
@@ -1,33 +1,39 @@
 <template>
   <!-- <el-card v-loading="loading" body-class="printMe"> -->
   <div class="w75% m-a">
+    <el-select style="width: 300px; margin-bottom: 10px" v-model="teamId" placeholder="请选择历史版本">
+      <el-option
+        v-for="(item, i) of histroyList"
+        :key="i"
+        :label="'版本' + item.version"
+        :value="item.id"
+        @click="changeForeman(item.id)"
+      ></el-option>
+    </el-select>
     <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">
           <span v-if="safetyInspectionDetail?.rectificationDeadline">{{
-            dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}</span>
+            dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日')
+          }}</span>
           <span v-else></span>
         </el-descriptions-item>
       </el-descriptions>
@@ -35,8 +41,8 @@
         <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>
@@ -62,11 +68,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?.rectificationName }}
+        <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 }}
@@ -90,14 +96,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>
@@ -119,13 +125,14 @@
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
 import { SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
-import { getSafetyInspection } from '@/api/safety/safetyInspection';
+import { getSafetyInspection, recordList } from '@/api/safety/safetyInspection';
 import { downLoadOss, listByIds } from '@/api/system/oss';
 import { OssVO } from '@/api/system/oss/types';
 import { dayjs } from 'element-plus';
 
 interface Props {
   safetyInspectionId?: string | number;
+  jobKey?: string;
 }
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -151,10 +158,19 @@ const inspectionType = computed(() => {
 
   return imgName;
 });
-
-const get = async () => {
+const teamId = ref('');
+const histroyList = ref<any[]>();
+// 获取列表
+const getList = async () => {
+  var res = await recordList(props.jobKey);
+  histroyList.value = res.data;
+};
+const changeForeman = (id) => {
+  get(id);
+};
+const get = async (id) => {
   loading.value = true;
-  const res = await getSafetyInspection(props.safetyInspectionId);
+  const res = await getSafetyInspection(id);
   if (res.data && res.code === 200) {
     safetyInspectionDetail.value = res.data;
     if (res.data.checkFile) {
@@ -174,8 +190,8 @@ const handleExport = async () => {
 };
 
 onMounted(() => {
-  console.log('🚀 ~ onMounted ~ props.safetyInspectionId:', props.safetyInspectionId);
-  get();
+  getList();
+  get(props.safetyInspectionId);
 });
 
 watch(
@@ -184,7 +200,7 @@ watch(
     if (newId !== oldId) {
       checkFileList.value = undefined;
       rectificationFileList.value = undefined;
-      get();
+      get(props.safetyInspectionId);
     }
   }
 );
diff --git a/src/views/safety/safetyInspection/index.vue b/src/views/safety/safetyInspection/index.vue
index 1ce5e1c..b476222 100644
--- a/src/views/safety/safetyInspection/index.vue
+++ b/src/views/safety/safetyInspection/index.vue
@@ -1,26 +1,22 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="检查类型" prop="checkType">
               <el-select v-model="queryParams.checkType" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="违章类型" prop="violationType">
               <el-select v-model="queryParams.violationType" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="处理状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in safety_inspection_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -36,19 +32,16 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyInspection:add']">
-              新增 </el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyInspection:add']"> 新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['safety:safetyInspection:remove']">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:safetyInspection:remove']">
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
-              v-hasPermi="['safety:safetyInspection:export']">导出 </el-button>
-          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:safetyInspection:export']">导出 </el-button>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -100,21 +93,31 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)"
-                v-hasPermi="['safety:safetyInspection:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)" v-hasPermi="['safety:safetyInspection:query']">
                 详情
               </el-button>
-              <el-button link type="success" v-if="scope.row.status === '1' || scope.row.reviewType === '2'"
-                icon="Pointer" @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:rectification']">
+              <el-button
+                link
+                type="success"
+                v-if="scope.row.status === '1' || scope.row.reviewType === '2'"
+                icon="Pointer"
+                @click="handleDialog(scope.row)"
+                v-hasPermi="['safety:safetyInspection:rectification']"
+              >
                 整改
               </el-button>
-              <el-button link type="warning" icon="SuccessFilled" v-if="scope.row.status === '2'"
-                @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:review']">
+              <el-button
+                link
+                type="warning"
+                icon="SuccessFilled"
+                v-if="scope.row.status === '2'"
+                @click="handleDialog(scope.row)"
+                v-hasPermi="['safety:safetyInspection:review']"
+              >
                 复查
               </el-button>
               <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyInspection:edit']">修改 </el-button> -->
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['safety:safetyInspection:remove']">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
                 删除
               </el-button>
             </el-space>
@@ -122,8 +125,7 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改安全巡检工单对话框 -->
 
@@ -134,14 +136,12 @@
         </el-form-item>
         <el-form-item label="检查类型" prop="checkType">
           <el-select v-model="form.checkType" placeholder="请选择检查类型">
-            <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="违章类型" prop="violationType">
           <el-select v-model="form.violationType" placeholder="请选择违章类型">
-            <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="巡检结果" prop="inspectionResult">
@@ -149,14 +149,12 @@
         </el-form-item>
         <el-form-item label="工单整改单位" prop="rectificationUnit">
           <el-select v-model="form.rectificationUnit" placeholder="请选择整改单位类型">
-            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="整改班组" prop="teamId">
           <el-select v-model="form.teamId" placeholder="请选择整改班组">
-            <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value"
-              @click="changeForeman(item.value)" />
+            <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value" @click="changeForeman(item.value)" />
           </el-select>
         </el-form-item>
         <el-form-item label="整改人" prop="correctorId">
@@ -178,16 +176,13 @@
           <el-input v-model="form.measure" type="textarea" placeholder="请输入内容" />
         </el-form-item> -->
         <el-form-item label="要求整改期限" prop="checkTime">
-          <el-date-picker clearable v-model="form.rectificationDeadline" type="date" value-format="YYYY-MM-DD"
-            placeholder="选择要求整改期限" />
+          <el-date-picker clearable v-model="form.rectificationDeadline" type="date" value-format="YYYY-MM-DD" placeholder="选择要求整改期限" />
         </el-form-item>
         <el-form-item label="检查附件" prop="checkFile">
-          <file-upload v-model="form.checkFile" :file-size="20"
-            :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
+          <file-upload v-model="form.checkFile" :file-size="20" :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
         </el-form-item>
         <el-form-item label="整改附件" prop="rectificationFile">
-          <file-upload v-model="form.rectificationFile" :file-size="20"
-            :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
+          <file-upload v-model="form.rectificationFile" :file-size="20" :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -201,10 +196,9 @@
       </template>
     </el-dialog>
     <el-dialog title="巡检工单详情" v-model="showDetailDialog" width="60vw">
-      <safety-inspection-detail-dialog :safety-inspection-id="currentSafetyInspectionId" />
+      <safety-inspection-detail-dialog :jobKey="jobKey" :safety-inspection-id="currentSafetyInspectionId" />
     </el-dialog>
-    <el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible"
-      width="500px">
+    <el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible" width="500px">
       <el-form ref="handleFormRef" :model="handleForm" :rules="rules" label-width="120px">
         <el-form-item label="整改措施" prop="measure" v-if="handleType === 'rectification'">
           <el-input v-model="handleForm.measure" type="textarea" placeholder="请输入内容" />
@@ -217,8 +211,7 @@
         </el-form-item>
         <el-form-item label="复查类型" prop="reviewType" v-if="handleType === 'review'">
           <el-select v-model="handleForm.reviewType" placeholder="请选择复查类型">
-            <el-option v-for="dict in review_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in review_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -237,7 +230,7 @@ import {
   listSafetyInspection,
   updateSafetyInspection,
   addSafetyInspectionReview,
-  addSafetyInspectionRectification,
+  addSafetyInspectionRectification
 } from '@/api/safety/safetyInspection';
 import { SafetyInspectionForm, SafetyInspectionQuery, SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -281,8 +274,8 @@ const handleForm = ref({
   rectificationFile: undefined,
   review: undefined,
   reviewType: undefined,
-  remark: undefined,
-})
+  remark: undefined
+});
 const initFormData: SafetyInspectionForm = {
   id: undefined,
   pid: undefined,
@@ -350,9 +343,7 @@ const { queryParams, form, rules } = toRefs(data);
 const teamOpt = ref([]);
 const foremanOpt = ref([]);
 const teamList = ref<ProjectTeamForemanResp[]>();
-const handleType = ref("")
-
-
+const handleType = ref('');
 
 /** 查询安全巡检工单列表 */
 const getList = async () => {
@@ -382,41 +373,39 @@ const changeForeman = (value: string | number) => {
 /** 处理安全巡查工单 */
 const handleSubmit = async () => {
   let flag = false;
-  if (handleType.value == "rectification") {
-    const { code } = await addSafetyInspectionRectification(handleForm.value)
-    if (code == 200) flag = true
+  if (handleType.value == 'rectification') {
+    const { code } = await addSafetyInspectionRectification(handleForm.value);
+    if (code == 200) flag = true;
   } else {
-    const { code } = await addSafetyInspectionReview(handleForm.value)
-    if (code == 200) flag = true
+    const { code } = await addSafetyInspectionReview(handleForm.value);
+    if (code == 200) flag = true;
   }
   if (flag) {
-    ElMessage.success("处理成功")
+    ElMessage.success('处理成功');
     handleDialogVisible.value = false;
-    getList()
-    reset()
+    getList();
+    reset();
   } else {
-    ElMessage.error("处理失败")
+    ElMessage.error('处理失败');
   }
-
-}
-
-
+};
+const jobKey = ref<string | number>('');
 /** 展开安全巡检工单详情对话框操作 */
 const currentSafetyInspectionId = ref<string | number>();
 const showDetailDialog = ref<boolean>(false);
 const handleDialogVisible = ref<boolean>(false);
-const handleShowDialog = (row?: SafetyInspectionVO) => {
+const handleShowDialog = (row) => {
   currentSafetyInspectionId.value = row.id;
+  jobKey.value = row?.jobKey;
 
   showDetailDialog.value = true;
 };
 /**打开整改/复查对话框操作*/
 const handleDialog = (row?: SafetyInspectionVO) => {
-
   if (row.status == '1') {
-    handleType.value = "rectification"
+    handleType.value = 'rectification';
   } else {
-    handleType.value = "review"
+    handleType.value = 'review';
   }
   handleForm.value.id = row.id;
   handleDialogVisible.value = true;