施工日志

2025-04-16 18:06:26 +08:00
parent b7ba954b4a
commit 6a60ecc5e9
25 changed files with 1654 additions and 102 deletions
--- a/package.json
+++ b/package.json
@ -48,8 +48,10 @@
    "vue-cropper": "1.1.1",
    "vue-i18n": "10.0.5",
    "vue-json-pretty": "2.4.0",
+    "vue-print-nb": "^1.7.5",
    "vue-router": "4.4.5",
    "vue-types": "5.1.3",
+    "vue3-print-nb": "^0.1.4",
    "vxe-table": "4.5.22"
  },
  "devDependencies": {
--- a/src/api/quality/qualityConstructionLog/index.ts
+++ b/src/api/quality/qualityConstructionLog/index.ts
@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructionLogQuery } from '@/api/quality/qualityConstructionLog/types';
+
+/**
+ * 查询质量-施工日志列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQualityConstructionLog = (query?: QualityConstructionLogQuery): AxiosPromise<QualityConstructionLogVO[]> => {
+  return request({
+    url: '/quality/qualityConstructionLog/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询质量-施工日志详细
+ * @param id
+ */
+export const getQualityConstructionLog = (id: string | number): AxiosPromise<QualityConstructionLogVO> => {
+  return request({
+    url: '/quality/qualityConstructionLog/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增质量-施工日志
+ * @param data
+ */
+export const addQualityConstructionLog = (data: QualityConstructionLogForm) => {
+  return request({
+    url: '/quality/qualityConstructionLog',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改质量-施工日志
+ * @param data
+ */
+export const updateQualityConstructionLog = (data: QualityConstructionLogForm) => {
+  return request({
+    url: '/quality/qualityConstructionLog',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除质量-施工日志
+ * @param id
+ */
+export const delQualityConstructionLog = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/quality/qualityConstructionLog/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/quality/qualityConstructionLog/types.ts
+++ b/src/api/quality/qualityConstructionLog/types.ts
@ -0,0 +1,84 @@
+export interface QualityConstructionLogVO {
+  /**
+   * 发生日期
+   */
+  happenDate: string;
+  id?: string | number;
+  projectName: string;
+  createTime: string;
+  fileList: any[];
+  file?: string;
+  /**
+   * 生产情况
+   */
+  productionStatus: string;
+
+  /**
+   * 技术质量安全工作
+   */
+  technologyQuality: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建者
+   */
+  createBy: string;
+}
+
+export interface QualityConstructionLogForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 发生日期
+   */
+  happenDate?: string;
+
+  /**
+   * 生产情况
+   */
+  productionStatus?: string;
+
+  /**
+   * 技术质量安全工作
+   */
+  technologyQuality?: string;
+
+  /**
+   * 附件
+   */
+  file?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface QualityConstructionLogQuery extends PageQuery {
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 发生日期
+   */
+  happenDate?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/quality/qualityInspection/index.ts
+++ b/src/api/quality/qualityInspection/index.ts
@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QualityInspectionVO, QualityInspectionForm, QualityInspectionQuery } from '@/api/quality/qualityInspection/types';
+
+/**
+ * 查询质量-检查工单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQualityInspection = (query?: QualityInspectionQuery): AxiosPromise<QualityInspectionVO[]> => {
+  return request({
+    url: '/quality/qualityInspection/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询质量-检查工单详细
+ * @param id
+ */
+export const getQualityInspection = (id: string | number): AxiosPromise<QualityInspectionVO> => {
+  return request({
+    url: '/quality/qualityInspection/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增质量-检查工单
+ * @param data
+ */
+export const addQualityInspection = (data: QualityInspectionForm) => {
+  return request({
+    url: '/quality/qualityInspection',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改质量-检查工单
+ * @param data
+ */
+export const updateQualityInspection = (data: QualityInspectionForm) => {
+  return request({
+    url: '/quality/qualityInspection',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除质量-检查工单
+ * @param id
+ */
+export const delQualityInspection = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/quality/qualityInspection/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/quality/qualityInspection/types.ts
+++ b/src/api/quality/qualityInspection/types.ts
@ -0,0 +1,166 @@
+export interface QualityInspectionVO {
+  /**
+   * 巡检类型
+   */
+  inspectionType: string;
+  id?: string | number;
+  projectName: string;
+  rectificationFileList: any[];
+  inspectionFile: string;
+  correctorName: string;
+  replyPeriodDate: string;
+  rectificationTime: string;
+  rectificationFile: string;
+  verificationResult: string;
+  /**
+   * 巡检附件
+   */
+  /**
+   * 巡检标题
+   */
+  inspectionHeadline: string;
+
+  /**
+   * 巡检结果
+   */
+  inspectionResult: string;
+
+  /**
+   * 工单状态（1通知 2整改 3验证）
+   */
+  inspectionStatus: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建者
+   */
+  createBy: string;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+}
+
+export interface QualityInspectionForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 巡检类型
+   */
+  inspectionType?: string;
+
+  /**
+   * 巡检标题
+   */
+  inspectionHeadline?: string;
+
+  /**
+   * 巡检结果
+   */
+  inspectionResult?: string;
+
+  /**
+   * 工单状态（1通知 2整改 3验证）
+   */
+  inspectionStatus?: string;
+
+  /**
+   * 巡检附件
+   */
+  inspectionFile?: string;
+
+  /**
+   * 班组id
+   */
+  teamId?: string | number;
+
+  /**
+   * 整改人（班组长）
+   */
+  corrector?: string;
+
+  /**
+   * 是否回复（1回复 2不回复）
+   */
+  isReply?: string;
+
+  /**
+   * 回复期限日期
+   */
+  replyPeriodDate?: string;
+
+  /**
+   * 整改反馈
+   */
+  rectificationResult?: string;
+
+  /**
+   * 整改时间
+   */
+  rectificationTime?: string;
+
+  /**
+   * 整改附件
+   */
+  rectificationFile?: string;
+
+  /**
+   * 验证结果
+   */
+  verificationResult?: string;
+
+  /**
+   * 验证状态（1通过 2未通过）
+   */
+  verificationType?: string;
+
+  /**
+   * 验证时间
+   */
+  verificationTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface QualityInspectionQuery extends PageQuery {
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 巡检类型
+   */
+  inspectionType?: string;
+
+  /**
+   * 工单状态（1通知 2整改 3验证）
+   */
+  inspectionStatus?: string;
+
+  /**
+   * 班组id
+   */
+  teamId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/safety/questionUserAnswer/types.ts
+++ b/src/api/safety/questionUserAnswer/types.ts
@ -30,6 +30,7 @@ export interface QuestionUserAnswerForm extends BaseEntity {
   */
  id?: string | number;
  teamId?: string | number;
+  userName?: string;
  /**
   * 项目id
   */
@ -82,6 +83,7 @@ export interface QuestionUserAnswerQuery extends PageQuery {
   */
  userId?: string | number;
  teamId?: string | number;
+  userName?: string;
  projectId?: string | number;
  /**
   * 考试类型（1线上考试 2线下考试）
--- a/src/api/system/oss/index.ts
+++ b/src/api/system/oss/index.ts
@ -29,5 +29,5 @@ export function delOss(ossId: string | number | Array<string | number>) {

 // 下载OSS对象存储
 export function downLoadOss(ossId: string | number | Array<string | number>) {
-  return download('/safety/questionUserAnswer/exportFile', { userIdList: ossId }, '安全考试.zip');
+  return download('/safety/questionUserAnswer/exportFile', { idList: ossId }, '安全考试.zip');
 }
--- a/src/assets/icons/svg/danggerVerification.png
+++ b/src/assets/icons/svg/danggerVerification.png
--- a/src/assets/icons/svg/derived.png
+++ b/src/assets/icons/svg/derived.png
--- a/src/assets/icons/svg/failure.png
+++ b/src/assets/icons/svg/failure.png
--- a/src/assets/icons/svg/print.png
+++ b/src/assets/icons/svg/print.png
--- a/src/assets/icons/svg/rectification.png
+++ b/src/assets/icons/svg/rectification.png
--- a/src/assets/icons/svg/successLogo.png
+++ b/src/assets/icons/svg/successLogo.png
--- a/src/assets/icons/svg/successVerification.png
+++ b/src/assets/icons/svg/successVerification.png
--- a/src/assets/icons/svg/successful.png
+++ b/src/assets/icons/svg/successful.png
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@ -92,7 +92,7 @@ const props = defineProps({
  isShowTip: propTypes.bool.def(true),
  //是否为施工人员上传
  isConstruction: propTypes.bool.def(false),
-  //是否为导入资料
+  //是否为上传zip文件
  isImportInfo: propTypes.bool.def(false),
  //ip地址
  uploadUrl: propTypes.string.def('/resource/oss/upload'),
@ -117,7 +117,6 @@ const showTip = computed(() => props.isShowTip && (props.fileType || props.fileS
 const fileUploadRef = ref<ElUploadInstance>();

 const accept = computed(() => {
-  console.log('🚀 ~ accept ~ props.fileType:', props.fileType.map((value) => `.${value}`).join(','));
  return props.fileType.map((value) => `.${value}`).join(',');
 });

--- a/src/main.ts
+++ b/src/main.ts
@ -28,6 +28,9 @@ import ElementIcons from '@/plugins/svgicon';
 //通信
 import mitt from 'mitt';

+//打印
+import print from 'vue3-print-nb';
+
 // permission control
 import './permission';

@ -51,6 +54,7 @@ app.use(HighLight);
 app.use(ElementIcons);
 app.use(router);
 app.use(store);
+app.use(print);
 app.use(i18n);
 app.use(VXETable);
 app.use(plugins);
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@ -6,23 +6,29 @@ import defAva from '@/assets/images/profile.jpg';
 import store from '@/store';
 import { defineStore } from 'pinia';
 import { SpecialType } from '@/api/project/workWage/types';
-
+import { getProjectTeam } from '@/utils/projectTeam';
+import $cache from '@/plugins/cache';
 // 添加两个函数用于操作localStorage
 const saveSelectedProjectToStorage = (project) => {
-  localStorage.setItem('selectedProject', JSON.stringify(project));
+  // localStorage.setItem('selectedProject', JSON.stringify(project));
+  $cache.local.setJSON('selectedProject', project);
+  getProjectTeam();
 };
 const saveProjectTeamToStorage = (project) => {
-  localStorage.setItem('ProjectTeamList', JSON.stringify(project));
+  // localStorage.setItem('ProjectTeamList', JSON.stringify(project));
+  $cache.local.setJSON('ProjectTeamList', project);
 };

 const getSelectedProjectFromStorage = () => {
-  const stored = localStorage.getItem('selectedProject');
-  return stored ? JSON.parse(stored) : null;
+  // localStorage.getItem('selectedProject');
+  const stored = $cache.local.getJSON('selectedProject');
+  return stored ? stored : null;
 };

 const getProjectTeamListFromStorage = () => {
-  const stored = localStorage.getItem('ProjectTeamList');
-  return stored ? JSON.parse(stored) : null;
+  const stored = $cache.local.getJSON('ProjectTeamList');
+
+  return stored ? stored : null;
 };

 export const useUserStore = defineStore('user', () => {
@ -109,7 +115,8 @@ export const useUserStore = defineStore('user', () => {
    permissions.value = [];
    removeToken();
    // 清除项目缓存
-    localStorage.removeItem('selectedProject');
+    $cache.local.remove('selectedProject');
+    $cache.local.remove('ProjectTeamList');
  };

  const setAvatar = (value: string) => {
--- a/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue
+++ b/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue
@ -0,0 +1,232 @@
+<template>
+  <!-- <el-card v-loading="loading" body-class="printMe"> -->
+  <div class="w75% m-a">
+    <div id="printMe" class="pos-relative">
+      <!-- <div class="resultIcon"><img src="../../../../assets/icons/svg/successLogo.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>
+        <el-descriptions-item label-align="center" label="发生日期" :span="2" label-class-name="white">
+          {{ parseTime(safetyInspectionDetail?.happenDate, '{y}-{m}-{d}') }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" :span="2" label="生产情况记录" class-name="zebra">
+          {{ safetyInspectionDetail?.productionStatus }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="技术质量安全工作" :span="2" label-class-name="white"
+          >{{ safetyInspectionDetail?.technologyQuality }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" :span="2" label="备注" class-name="zebra"
+          >{{ safetyInspectionDetail?.remark }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" :span="2" label="附件" label-class-name="white"
+          ><el-space wrap>
+            <div v-for="item in checkFileList" :key="item.ossId">
+              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                <image-preview :src="item.url" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.originalName }} </span>
+                </el-link>
+              </span>
+            </div>
+          </el-space>
+        </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>
+        <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
+          <el-space wrap>
+            <div v-for="item in checkFileList" :key="item.ossId">
+              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                <image-preview :src="item.url" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.originalName }} </span>
+                </el-link>
+              </span>
+            </div>
+          </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?.status)" finish-status="success">
+            <el-step v-for="item in safety_inspection_type" :key="item.value" :title="item.label" />
+          </el-steps>
+        </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="班组" label-class-name="white"
+          >{{ safetyInspectionDetail?.teamName }}
+        </el-descriptions-item>
+        <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 }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
+          <el-space wrap>
+            <div v-for="item in rectificationFileList" :key="item.ossId">
+              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                <image-preview :src="item.url" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                  <span> {{ item.originalName }} </span>
+                </el-link>
+              </span>
+            </div>
+          </el-space>
+        </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="复查人" 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>
+        <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
+          >{{ safetyInspectionDetail?.review }}
+        </el-descriptions-item>
+      </el-descriptions> -->
+    </div>
+  </div>
+
+  <!-- </el-card> -->
+  <div class="dialog-footer">
+    <div class="btn-item">
+      <img src="../../../../assets/icons/svg/derived.png" />
+      <span>导出</span>
+    </div>
+    <!-- <div class="btn-item" v-print="'#printMe'">
+      <img src="../../../../assets/icons/svg/print.png" />
+      <span>打印</span>
+    </div> -->
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { getQualityConstructionLog } from '@/api/quality/qualityConstructionLog';
+import { QualityConstructionLogVO, QualityConstructionLogQuery, QualityConstructionLogForm } from '@/api/quality/qualityConstructionLog/types';
+import { dayjs } from 'element-plus';
+import { useUserStoreHook } from '@/store/modules/user';
+import { s } from 'node_modules/vite/dist/node/types.d-aGj9QkWt';
+import { listByIds } from '@/api/system/oss';
+const safetyInspectionDetail = ref<QualityConstructionLogVO>();
+const checkFileList = ref<any[]>();
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+interface Props {
+  qualityConstructionId?: string | number;
+}
+
+const props = defineProps<Props>();
+
+//获取详情
+const get = async () => {
+  const res = await getQualityConstructionLog(props.qualityConstructionId);
+  if (res.data && res.code === 200) {
+    safetyInspectionDetail.value = res.data;
+
+    if (res.data.fileList) {
+      const checkFileRes = await listByIds(res.data.file.split(','));
+      checkFileList.value = checkFileRes.data;
+    }
+    // if (res.data.rectificationFile) {
+    //   const rectificationFileRes = await listByIds(res.data.rectificationFile.split(','));
+    //   rectificationFileList.value = rectificationFileRes.data;
+    // }
+  }
+};
+
+onMounted(() => {
+  get();
+});
+
+watch(
+  () => props.qualityConstructionId,
+  (newId, oldId) => {
+    if (newId !== oldId) {
+      checkFileList.value = undefined;
+      //   rectificationFileList.value = undefined;
+      get();
+    }
+  }
+);
+</script>
+
+<style scoped lang="scss">
+#printMe {
+  padding: 15px 20px 20px 20px !important;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12);
+}
+
+:deep(.white) {
+  background: #fff !important;
+}
+
+:deep(.none) {
+  display: none !important;
+}
+
+:deep(.zebra) {
+  background: #f5f7fa;
+}
+
+@page {
+  size: auto;
+  margin: 0mm;
+}
+
+.dialog-footer {
+  height: 100px;
+  display: flex;
+
+  flex-direction: column;
+  justify-content: space-between;
+  position: absolute;
+  top: 14%;
+  right: 6%;
+  background: #fff;
+  box-shadow: 0 0 10px #ddd;
+  text-align: center;
+  padding: 20px 10px;
+
+  .btn-item {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    cursor: pointer;
+  }
+}
+
+.resultIcon {
+  position: absolute;
+  top: 100px;
+  right: 50px;
+  z-index: 10;
+  width: 105px;
+  height: 105px;
+}
+</style>
--- a/src/views/quality/qualityConstructionLog/index.vue
+++ b/src/views/quality/qualityConstructionLog/index.vue
@ -0,0 +1,237 @@
+<template>
+  <div class="p-2">
+    <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="happenDate">
+              <el-date-picker clearable v-model="queryParams.happenDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择发生日期" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <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:qualityConstructionLog:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['quality:qualityConstructionLog:edit']">修改</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['quality:qualityConstructionLog:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['quality:qualityConstructionLog:export']">导出</el-button>
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="qualityConstructionLogList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" width="70" />
+
+        <el-table-column label="生产情况" align="center" prop="productionStatus" />
+        <el-table-column label="技术质量安全工作" align="center" prop="technologyQuality" />
+        <el-table-column label="发生日期" align="center" prop="happenDate" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.happenDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建者" align="center" prop="createBy" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="详情" placement="top">
+              <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['quality:qualityConstructionLog:remove']"
+              ></el-button>
+            </el-tooltip>
+          </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" />
+    </el-card>
+    <!-- 详情对话框 -->
+    <el-dialog title="施工日志详情" v-model="dialog.visible" width="60vw" append-to-body>
+      <quality-construction-detail :qualityConstructionId="currentId" />
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QualityConstructionLog" lang="ts">
+import {
+  listQualityConstructionLog,
+  getQualityConstructionLog,
+  delQualityConstructionLog,
+  addQualityConstructionLog,
+  updateQualityConstructionLog
+} from '@/api/quality/qualityConstructionLog';
+import { QualityConstructionLogVO, QualityConstructionLogQuery, QualityConstructionLogForm } from '@/api/quality/qualityConstructionLog/types';
+import QualityConstructionDetail from './cpmponent/qualityConstructionDetail.vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const qualityConstructionLogList = ref<QualityConstructionLogVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const qualityConstructionLogFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: QualityConstructionLogForm = {
+  id: undefined,
+  projectId: undefined,
+  happenDate: undefined,
+  productionStatus: undefined,
+  technologyQuality: undefined,
+  file: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<QualityConstructionLogForm, QualityConstructionLogQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: undefined,
+    happenDate: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
+    projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
+    happenDate: [{ required: true, message: '发生日期不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询质量-施工日志列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQualityConstructionLog(queryParams.value);
+  qualityConstructionLogList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  qualityConstructionLogFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QualityConstructionLogVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加质量-施工日志';
+};
+
+const currentId = ref<string | number>('');
+/** 修改按钮操作 */
+const handleUpdate = async (row?: QualityConstructionLogVO) => {
+  currentId.value = row?.id;
+  dialog.visible = true;
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  qualityConstructionLogFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateQualityConstructionLog(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addQualityConstructionLog(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QualityConstructionLogVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除质量-施工日志编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delQualityConstructionLog(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'quality/qualityConstructionLog/export',
+    {
+      ...queryParams.value
+    },
+    `qualityConstructionLog_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
+++ b/src/views/quality/qualityInspection/component/qualityInspectionDetail.vue
@ -0,0 +1,224 @@
+<template>
+  <!-- <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>
+      <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"
+          >{{ safetyInspectionDetail?.projectName }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="巡检标题" :span="2" label-class-name="white">
+          {{ safetyInspectionDetail?.inspectionHeadline }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="整改人" class-name="zebra">
+          {{ safetyInspectionDetail?.correctorName }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="整改日期" class-name="zebra">
+          {{ dayjs(safetyInspectionDetail?.rectificationTime).format('YYYY 年 MM 月 DD 日') }}
+        </el-descriptions-item>
+        <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?.creatorName }}
+        </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?.replyPeriodDate }}
+        </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>
+        <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
+          <el-space wrap>
+            <div v-for="item in checkFileList" :key="item.ossId">
+              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                <image-preview :src="item.url" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.originalName }} </span>
+                </el-link>
+              </span>
+            </div>
+          </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-step v-for="item in quality_inspection_status_type" :key="item.value" :title="item.label" />
+          </el-steps>
+        </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?.measure }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
+          <el-space wrap>
+            <div v-for="item in rectificationFileList" :key="item.ossId">
+              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                <image-preview :src="item.url" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                  <span> {{ item.originalName }} </span>
+                </el-link>
+              </span>
+            </div>
+          </el-space>
+        </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="验证结果" label-class-name="white"
+          >{{ safetyInspectionDetail?.verificationResult }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+
+  <!-- </el-card> -->
+  <div class="dialog-footer">
+    <div class="btn-item">
+      <img src="../../../../assets/icons/svg/derived.png" />
+      <span>导出</span>
+    </div>
+    <div class="btn-item" v-print="'#printMe'">
+      <img src="../../../../assets/icons/svg/print.png" />
+      <span>打印</span>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { getQualityInspection } from '@/api/quality/qualityInspection';
+import { QualityInspectionVO } from '@/api/quality/qualityInspection/types';
+import { listByIds } from '@/api/system/oss';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { dayjs } from 'element-plus';
+const { quality_inspection_check_type, quality_inspection_status_type } = toRefs<any>(
+  proxy?.useDict('quality_inspection_check_type', 'quality_inspection_status_type')
+);
+interface Props {
+  qualityInspectionDetailId?: string | number;
+}
+
+const props = defineProps<Props>();
+const safetyInspectionDetail = ref<QualityInspectionVO>();
+const checkFileList = ref<any[]>();
+const rectificationFileList = ref<any[]>();
+
+//检查状态图片
+const inspectionType = computed(() => {
+  let imgName = 'successLogo';
+  if (safetyInspectionDetail.value?.inspectionStatus == '2') imgName = 'rectification';
+  if (safetyInspectionDetail.value?.inspectionStatus == '1') imgName = 'successVerification';
+  if (safetyInspectionDetail.value?.inspectionStatus == '2') imgName = 'danggerVerification';
+  return imgName;
+});
+
+//获取详情
+const get = async () => {
+  const res = await getQualityInspection(props.qualityInspectionDetailId);
+  if (res.data && res.code === 200) {
+    safetyInspectionDetail.value = res.data;
+
+    if (res.data.rectificationFileList) {
+      const checkFileRes = await listByIds(res.data.inspectionFile.split(','));
+      checkFileList.value = checkFileRes.data;
+    }
+    if (res.data.rectificationFile) {
+      const rectificationFileRes = await listByIds(res.data.rectificationFile.split(','));
+      rectificationFileList.value = rectificationFileRes.data;
+    }
+  }
+};
+
+onMounted(() => {
+  //   get();
+});
+
+watch(
+  () => props.qualityInspectionDetailId,
+  (newId, oldId) => {
+    if (newId !== oldId) {
+      checkFileList.value = undefined;
+      //   rectificationFileList.value = undefined;
+      get();
+    }
+  }
+);
+</script>
+
+<style scoped lang="scss">
+#printMe {
+  padding: 15px 20px 20px 20px !important;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12);
+}
+
+:deep(.white) {
+  background: #fff !important;
+}
+
+:deep(.none) {
+  display: none !important;
+}
+
+:deep(.zebra) {
+  background: #f5f7fa;
+}
+
+@page {
+  size: auto;
+  margin: 0mm;
+}
+
+.dialog-footer {
+  height: 200px;
+  display: flex;
+
+  flex-direction: column;
+  justify-content: space-between;
+  position: absolute;
+  top: 14%;
+  right: 6%;
+  background: #fff;
+  box-shadow: 0 0 10px #ddd;
+  text-align: center;
+  padding: 20px 10px;
+
+  .btn-item {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    cursor: pointer;
+  }
+}
+
+.resultIcon {
+  position: absolute;
+  top: 100px;
+  right: 50px;
+  z-index: 10;
+  width: 105px;
+  height: 105px;
+  img {
+    width: 105px;
+  }
+}
+</style>
--- a/src/views/quality/qualityInspection/index.vue
+++ b/src/views/quality/qualityInspection/index.vue
@ -0,0 +1,377 @@
+<template>
+  <div class="p-2">
+    <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-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-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <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-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['quality:qualityInspection:edit']"
+              >修改</el-button
+            >
+          </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-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="qualityInspectionList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键id" align="center" prop="id" v-if="false" />
+        <el-table-column label="巡检类型" align="center" prop="inspectionType">
+          <template #default="scope">
+            <dict-tag :options="quality_inspection_check_type" :value="scope.row.inspectionType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="巡检标题" align="center" prop="inspectionHeadline" />
+        <el-table-column label="巡检结果" align="center" prop="inspectionResult" />
+        <el-table-column label="工单状态" align="center" prop="inspectionStatus">
+          <template #default="scope">
+            <dict-tag :options="quality_inspection_status_type" :value="scope.row.inspectionStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="创建者" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="验证" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="EditPen"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['quality:qualityInspection:edit']"
+              ></el-button>
+            </el-tooltip>
+            <el-tooltip content="详情" placement="top">
+              <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['quality:qualityInspection:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['quality:qualityInspection:remove']"
+              ></el-button>
+            </el-tooltip>
+          </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" />
+    </el-card>
+    <!-- 添加或修改质量-检查工单对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="700px" append-to-body>
+      <el-form ref="qualityInspectionFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="巡检标题" prop="inspectionHeadline">
+          <el-input v-model="form.inspectionHeadline" placeholder="请输入巡检标题" />
+        </el-form-item>
+        <el-form-item label="巡检结果" prop="inspectionResult">
+          <el-input v-model="form.inspectionResult" placeholder="请输入巡检结果" />
+        </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-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-select>
+        </el-form-item>
+        <el-form-item label="整改人" prop="corrector">
+          <el-select v-model="form.corrector" placeholder="请输入整改人" :disabled="!form.teamId">
+            <el-option v-for="dict in foremanOpt" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="工单状态" prop="inspectionStatus">
+          <el-radio-group v-model="form.inspectionStatus">
+            <el-radio v-for="dict in quality_inspection_status_type" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <el-form-item label="附件" prop="inspectionFile">
+          <file-upload v-model="form.inspectionFile" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog title="质量工单详情" v-model="dialog.details" width="60vw">
+      <quality-inspection-detail :quality-inspection-detail-id="currentId" />
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QualityInspection" lang="ts">
+import { listProjectTeamForeman } from '@/api/project/projectTeam';
+import { foremanQuery, ProjectTeamForemanResp } from '@/api/project/projectTeam/types';
+
+import {
+  listQualityInspection,
+  getQualityInspection,
+  delQualityInspection,
+  addQualityInspection,
+  updateQualityInspection
+} from '@/api/quality/qualityInspection';
+import { QualityInspectionVO, QualityInspectionQuery, QualityInspectionForm } from '@/api/quality/qualityInspection/types';
+import { useUserStoreHook } from '@/store/modules/user';
+import QualityInspectionDetail from './component/qualityInspectionDetail.vue';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { quality_inspection_check_type, quality_inspection_status_type } = toRefs<any>(
+  proxy?.useDict('quality_inspection_check_type', 'quality_inspection_status_type')
+);
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const qualityInspectionList = ref<QualityInspectionVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const qualityInspectionFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  details: true,
+  title: ''
+});
+
+const initFormData: QualityInspectionForm = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  inspectionType: undefined,
+  inspectionHeadline: undefined,
+  inspectionResult: undefined,
+  inspectionStatus: undefined,
+  inspectionFile: undefined,
+  teamId: undefined,
+  corrector: undefined,
+  isReply: undefined,
+  replyPeriodDate: undefined,
+  rectificationResult: undefined,
+  rectificationTime: undefined,
+  rectificationFile: undefined,
+  verificationResult: undefined,
+  verificationType: undefined,
+  verificationTime: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<QualityInspectionForm, QualityInspectionQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value?.id,
+    inspectionType: undefined,
+    inspectionStatus: undefined,
+    teamId: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
+    projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
+    inspectionType: [{ required: true, message: '巡检类型不能为空', trigger: 'change' }],
+    inspectionHeadline: [{ required: true, message: '巡检标题不能为空', trigger: 'blur' }],
+    inspectionResult: [{ required: true, message: '巡检结果不能为空', trigger: 'blur' }],
+    teamId: [{ required: true, message: '班组id不能为空', trigger: 'blur' }],
+    corrector: [{ required: true, message: '整改人不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+const teamOpt = ref([]);
+const foremanOpt = ref([]);
+const teamList = ref<ProjectTeamForemanResp[]>();
+/** 查询质量-检查工单列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQualityInspection(queryParams.value);
+  qualityInspectionList.value = res.rows;
+  total.value = res.total;
+  // 获取项目班组信息
+  const teamRes = await listProjectTeamForeman(currentProject.value.id);
+  teamList.value = teamRes.data;
+  teamOpt.value = teamList.value.map((team: ProjectTeamForemanResp) => ({
+    label: team.teamName,
+    value: team.id
+  }));
+  loading.value = false;
+};
+
+const changeForeman = (value: string) => {
+  const team = teamList.value.filter((team) => team.id === value)[0];
+  foremanOpt.value = team.foremanList?.map((foreman: foremanQuery) => ({
+    label: foreman.foremanName,
+    value: foreman.foremanId
+  }));
+  form.value.corrector = '';
+};
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  qualityInspectionFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QualityInspectionVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加质量-检查工单';
+};
+
+/** 验证按钮操作 */
+const handleUpdate = async (row?: QualityInspectionVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getQualityInspection(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改质量-检查工单';
+};
+
+const currentId = ref<string | number>('');
+/** 详情按钮操作 */
+const handleDetail = async (row?: QualityInspectionVO) => {
+  currentId.value = row?.id;
+  dialog.details = true;
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  qualityInspectionFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateQualityInspection(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addQualityInspection(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QualityInspectionVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除质量-检查工单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delQualityInspection(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'quality/qualityInspection/export',
+    {
+      ...queryParams.value
+    },
+    `qualityInspection_${new Date().getTime()}.xlsx`
+  );
+};
+
+//监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value.id,
+  (nid, oid) => {
+    queryParams.value.projectId = nid;
+    form.value.projectId = nid;
+    getList();
+  }
+);
+
+onUnmounted(() => {
+  listeningProject();
+});
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/safety/questionUserAnswer/index.vue
+++ b/src/views/safety/questionUserAnswer/index.vue
@ -4,8 +4,8 @@
      <div v-show="showSearch" class="mb-[10px]">
        <el-card shadow="hover">
          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="用户姓名" prop="userId">
-              <el-input v-model="queryParams.userId" placeholder="请输入用户姓名" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="用户姓名" prop="userName">
+              <el-input v-model="queryParams.userName" placeholder="请输入用户姓名" clearable @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item label="班组" prop="teamId">
              <el-select v-model="queryParams.teamId" clearable placeholder="全部">
@ -70,7 +70,7 @@
              <el-button link type="primary" icon="View">预览试卷</el-button>
            </el-link>

-            <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)">下载试卷</el-button>
+            <el-button link type="primary" icon="Download" @click="downloadOssOne(scope.row)">下载试卷</el-button>
          </template>
        </el-table-column>
      </el-table>
@ -129,6 +129,7 @@ const initFormData: QuestionUserAnswerForm = {
  userId: undefined,
  bankId: undefined,
  answer: undefined,
+  userName: undefined,
  score: undefined,
  examTime: undefined,
  takeTime: undefined,
@ -145,6 +146,7 @@ const data = reactive<PageData<QuestionUserAnswerForm, QuestionUserAnswerQuery>>
    examType: undefined,
    teamId: undefined,
    projectId: currentProject.value.id,
+    userName: undefined,
    params: {}
  },
  rules: {
@ -206,10 +208,14 @@ const handleSelectionChange = (selection: QuestionUserAnswerVO[]) => {
 //   dialog.title = '修改用户试卷存储';
 // };

-/** 删除按钮操作 */
-const handleDownload = async (row?: QuestionUserAnswerVO) => {
-  const _ids = row?.id || ids.value;
-  const res = await downLoadOss(_ids);
+/** 批量下载按钮操作 */
+const handleDownload = async () => {
+  const _ids = ids.value;
+  await downLoadOss(_ids);
+};
+/** 下载单个按钮操作 */
+const downloadOssOne = async (row?: QuestionUserAnswerVO) => {
+  await download.oss(row?.file);
 };

 // const fileWatch = watch(
--- a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
+++ b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
@ -1,83 +1,113 @@
 <template>
-  <el-card v-loading="loading">
-    <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="检查类型" 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>
-      <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
-        {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
-      </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>
-      <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
-        <el-space wrap>
-          <div v-for="item in checkFileList" :key="item.ossId">
-            <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-              <image-preview :src="item.url" width="200px" />
-            </span>
-            <span v-else>
-              <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
-                <span> {{ item.originalName }} </span>
-              </el-link>
-            </span>
-          </div>
-        </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?.status)" finish-status="success">
-          <el-step v-for="item in safety_inspection_type" :key="item.value" :title="item.label" />
-        </el-steps>
-      </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="班组" label-class-name="white">{{ safetyInspectionDetail?.teamName }} </el-descriptions-item>
-      <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 }}
-      </el-descriptions-item>
-      <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
-        <el-space wrap>
-          <div v-for="item in rectificationFileList" :key="item.ossId">
-            <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
-              <image-preview :src="item.url" width="200px" />
-            </span>
-            <span v-else>
-              <el-link :href="`${item.url}`" :underline="false" target="_blank">
-                <span> {{ item.originalName }} </span>
-              </el-link>
-            </span>
-          </div>
-        </el-space>
-      </el-descriptions-item>
-    </el-descriptions size="large">
-    <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="复查人" 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>
-      <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white">{{ safetyInspectionDetail?.review }} </el-descriptions-item>
-    </el-descriptions>
-  </el-card>
+  <!-- <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>
+      <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="检查类型" 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>
+        <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
+          {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
+        </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>
+        <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
+          <el-space wrap>
+            <div v-for="item in checkFileList" :key="item.ossId">
+              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                <image-preview :src="item.url" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
+                  <span> {{ item.originalName }} </span>
+                </el-link>
+              </span>
+            </div>
+          </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?.status)" finish-status="finish">
+            <el-step v-for="item in safety_inspection_type" :key="item.value" :title="item.label" />
+          </el-steps>
+        </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="班组" label-class-name="white"
+          >{{ safetyInspectionDetail?.teamName }}
+        </el-descriptions-item>
+        <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 }}
+        </el-descriptions-item>
+        <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
+          <el-space wrap>
+            <div v-for="item in rectificationFileList" :key="item.ossId">
+              <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                <image-preview :src="item.url" width="200px" />
+              </span>
+              <span v-else>
+                <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                  <span> {{ item.originalName }} </span>
+                </el-link>
+              </span>
+            </div>
+          </el-space>
+        </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="复查人" 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>
+        <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
+          >{{ safetyInspectionDetail?.review }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+
+  <!-- </el-card> -->
+  <div class="dialog-footer">
+    <div class="btn-item">
+      <img src="../../../../assets/icons/svg/derived.png" />
+      <span>导出</span>
+    </div>
+    <div class="btn-item" v-print="'#printMe'">
+      <img src="../../../../assets/icons/svg/print.png" />
+      <span>打印</span>
+    </div>
+  </div>
 </template>

 <script setup lang="ts">
@ -105,12 +135,22 @@ const loading = ref<boolean>(false);
 const safetyInspectionDetail = ref<SafetyInspectionVO>();
 const checkFileList = ref<OssVO[]>();
 const rectificationFileList = ref<OssVO[]>();
+//检查状态图片
+const inspectionType = computed(() => {
+  let imgName = 'successLogo';
+  if (safetyInspectionDetail.value?.status == '2') imgName = 'rectification';
+  if (safetyInspectionDetail.value?.reviewType == '1') imgName = 'successful';
+  if (safetyInspectionDetail.value?.reviewType == '2') imgName = 'failure';
+  console.log('🚀 ~ inspectionType ~ imgName:', imgName);
+
+  return imgName;
+});
+
 const get = async () => {
  loading.value = true;
  const res = await getSafetyInspection(props.safetyInspectionId);
  if (res.data && res.code === 200) {
    safetyInspectionDetail.value = res.data;
-
    if (res.data.checkFile) {
      const checkFileRes = await listByIds(res.data.checkFile.split(','));
      checkFileList.value = checkFileRes.data;
@ -141,13 +181,59 @@ watch(
 </script>

 <style scoped lang="scss">
-:deep(.white) {
-  background: #fff!important;
+#printMe {
+  padding: 15px 20px 20px 20px !important;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12);
 }
+
+:deep(.white) {
+  background: #fff !important;
+}
+
 :deep(.none) {
  display: none !important;
 }
+
 :deep(.zebra) {
-  background: #f5f7fa; 
+  background: #f5f7fa;
+}
+
+@page {
+  size: auto;
+  margin: 0mm;
+}
+
+.dialog-footer {
+  height: 200px;
+  display: flex;
+
+  flex-direction: column;
+  justify-content: space-between;
+  position: absolute;
+  top: 14%;
+  right: 6%;
+  background: #fff;
+  box-shadow: 0 0 10px #ddd;
+  text-align: center;
+  padding: 20px 10px;
+
+  .btn-item {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    cursor: pointer;
+  }
+}
+
+.resultIcon {
+  position: absolute;
+  top: 100px;
+  right: 50px;
+  z-index: 10;
+  width: 105px;
+  height: 105px;
+  img {
+    width: 105px;
+  }
 }
 </style>
--- a/src/views/safety/safetyInspection/index.vue
+++ b/src/views/safety/safetyInspection/index.vue
@ -147,7 +147,7 @@
        </div>
      </template>
    </el-dialog>
-    <el-dialog title="巡检工单详情" v-model="showDetailDialog">
+    <el-dialog title="巡检工单详情" v-model="showDetailDialog" width="60vw">
      <safety-inspection-detail-dialog :safety-inspection-id="currentSafetyInspectionId" />
    </el-dialog>
  </div>