From 2530d035c5dcfbbcf4acbad5180190a2d710bb38 Mon Sep 17 00:00:00 2001
From: zhangyanli <zhangyanli@zcloudchina.com>
Date: Wed, 21 Feb 2024 16:14:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86=E5=92=8C?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/hidden_danger_government.js       | 12 ++-
 src/request/troubleshooting_statistics.js     | 15 +++-
 .../acceptance/acceptance.vue                 | 24 ++++--
 .../acceptance/index.vue                      | 14 ++-
 .../hidden_danger_government/ledger/index.vue | 22 +++--
 .../hidden_danger_government/major/index.vue  | 15 ++--
 .../hidden_danger_government/major/view.vue   | 22 +++--
 .../rectification/index.vue                   | 11 ++-
 .../rectification/rectification.vue           | 25 ++++--
 .../day_inspection/index.vue                  | 19 +++-
 .../day_inspection/inspection_records.vue     | 83 +++++++++++++-----
 .../ten_day_inspection/inspection_records.vue | 86 ++++++++++++++-----
 .../week_inspection/inspection_records.vue    | 86 ++++++++++++++-----
 13 files changed, 318 insertions(+), 116 deletions(-)

diff --git a/src/request/hidden_danger_government.js b/src/request/hidden_danger_government.js
index 2af0331..85f0450 100644
--- a/src/request/hidden_danger_government.js
+++ b/src/request/hidden_danger_government.js
@@ -1,6 +1,8 @@
 import { post, upload } from "@/request/axios.js";
 
 export const getHiddenDangerList = (params) => post("/hidden/list", params); // 隐患列表
+export const getHiddenDangerListAll = (params) =>
+  post("/hidden/hiddenListAll", params); // 隐患列表
 export const getHiddenDangerRectificationWhy = (params) =>
   post("/app/corpinfo/goqyzzh", params); // 隐患整改不知道在获取什么
 export const setHiddenDangerRectificationNormalSubmit = (params) =>
@@ -8,10 +10,18 @@ export const setHiddenDangerRectificationNormalSubmit = (params) =>
 export const setHiddenDangerRectificationAbnormalSubmit = (params) =>
   post("/hidden/editRec", params); // 隐患整改不正常整改提交
 export const setHiddenDangerAcceptSubmit = (params) =>
-  post("/hidden/check", params); // 隐患验证提交
+  post("/hidden/check", params); // 隐患验收提交
 export const setHiddenDangerCancelMajorHazards = (params) =>
   post("/hidden/editHIDDENLEVEL", params); // 重大隐患管理取消重大隐患
 export const setHiddenDangerConfirmMajorHazards = (params) =>
   post("/hidden/editISCONFIRM", params); // 重大隐患管理确认重大隐患
 export const getHiddenDangerPrintList = (params) =>
   post("/hidden/listAllToPrint", params); // 隐患打印列表
+export const setCustomHiddenDangerRectificationNormalSubmit = (params) =>
+  upload("/customHidden/rectify", params); // 隐患整改正常整改提交  *隐患排查
+export const setCustomHiddenDangerRectificationAbnormalSubmit = (params) =>
+  post("/customHidden/editRec", params); // 隐患整改不正常整改提交*隐患排查
+export const setCustomHiddenDangerAcceptSubmit = (params) =>
+  post("/customHidden/check", params); // 隐患验证提交*隐患排查
+export const setCustomHiddenDangerConfirmMajorHazards = (params) =>
+  post("/customHidden/editISCONFIRM", params); // 重大隐患管理确认重大隐患*隐患排查
diff --git a/src/request/troubleshooting_statistics.js b/src/request/troubleshooting_statistics.js
index 54852ec..7ccb54e 100644
--- a/src/request/troubleshooting_statistics.js
+++ b/src/request/troubleshooting_statistics.js
@@ -1,10 +1,17 @@
 import { post } from "@/request/axios.js";
 
 export const getChecklistInspectionRecordList = (params) =>
-  post("/listmanager/recordList", params); // 清单检查记录列表
+  post("/listmanager/recordListAll", params); // 清单检查记录列表
 export const getChecklistInspectionRecordDayInspectionList = (params) =>
-  post("/listmanager/statisticsListCheckDay", params); // 清单检查记录日检列表
+  post("/listmanager/statisticsListCheckDay", params); // 清单检查记录日检列表-风险管控清单
+export const getCustomChecklistInspectionRecordDayInspectionList = (params) =>
+  post("/hiddenstandardCustom/statisticsListCheckDay", params); // 清单检查记录日检列表-隐患排查清单
 export const getChecklistInspectionRecordWeekInspectionList = (params) =>
-  post("/listmanager/statisticsListCheckWeek", params); // 清单检查记录周检列表
+  post("/listmanager/statisticsListCheckWeek", params); // 清单检查记录周检列表-风险管控清单
+export const getCustomChecklistInspectionRecordWeekInspectionList = (params) =>
+  post("/hiddenstandardCustom/statisticsListCheckWeek", params); // 清单检查记录周检列表-隐患排查清单
 export const getChecklistInspectionRecordTenDayInspectionList = (params) =>
-  post("/listmanager/statisticsListCheckTenday", params); // 清单检查记录旬检列表
+  post("/listmanager/statisticsListCheckTenday", params); // 清单检查记录旬检列表-风险管控清单
+export const getCustomChecklistInspectionRecordTenDayInspectionList = (
+  params
+) => post("/hiddenstandardCustom/statisticsListCheckTenday", params); // 清单检查记录旬检列表-风险管控清单
diff --git a/src/views/hidden_danger_government/acceptance/acceptance.vue b/src/views/hidden_danger_government/acceptance/acceptance.vue
index dbc32f4..87d45da 100644
--- a/src/views/hidden_danger_government/acceptance/acceptance.vue
+++ b/src/views/hidden_danger_government/acceptance/acceptance.vue
@@ -1,6 +1,6 @@
 <template>
   <layout-card>
-    <layout-hidden-view :hidden-id="HIDDEN_ID" />
+    <layout-hidden-view :hidden-id="HIDDEN_ID" :list-type="LIST_TYPE" />
     <el-divider content-position="left">隐患验收</el-divider>
     <el-form
       ref="formRef"
@@ -65,12 +65,15 @@ import { debounce } from "throttle-debounce";
 import useFormValidate from "@/assets/js/useFormValidate.js";
 import { ElMessage } from "element-plus";
 import LayoutUpload from "@/components/upload/index.vue";
-import { setHiddenDangerAcceptSubmit } from "@/request/hidden_danger_government.js";
+import {
+  setCustomHiddenDangerAcceptSubmit,
+  setHiddenDangerAcceptSubmit,
+} from "@/request/hidden_danger_government.js";
 import { setUploadImg } from "@/request/api.js";
 
 const route = useRoute();
 const router = useRouter();
-const { HIDDEN_ID } = route.query;
+const { HIDDEN_ID, LIST_TYPE } = route.query;
 const formRef = ref(null);
 const rules = {
   ISQUALIFIED: [
@@ -96,10 +99,17 @@ const fnSubmit = debounce(
   1000,
   async () => {
     await useFormValidate(formRef);
-    const resData = await setHiddenDangerAcceptSubmit({
-      HIDDEN_ID,
-      ...data.form,
-    });
+
+    const resData =
+      LIST_TYPE === "1"
+        ? await setHiddenDangerAcceptSubmit({
+            HIDDEN_ID,
+            ...data.form,
+          })
+        : await setCustomHiddenDangerAcceptSubmit({
+            HIDDEN_ID,
+            ...data.form,
+          });
     for (let i = 0; i < data.form.acceptFile.length; i++) {
       if (data.form.acceptFile[i].raw)
         await fnUploadImage(
diff --git a/src/views/hidden_danger_government/acceptance/index.vue b/src/views/hidden_danger_government/acceptance/index.vue
index ebbc861..cd6a2cb 100644
--- a/src/views/hidden_danger_government/acceptance/index.vue
+++ b/src/views/hidden_danger_government/acceptance/index.vue
@@ -82,7 +82,10 @@
               @click="
                 router.push({
                   path: '/hidden_danger_government/acceptance/view',
-                  query: { HIDDEN_ID: row.HIDDEN_ID },
+                  query: {
+                    HIDDEN_ID: row.HIDDEN_ID,
+                    LIST_TYPE: row.LIST_TYPE,
+                  },
                 })
               "
             >
@@ -96,7 +99,10 @@
               @click="
                 router.push({
                   path: '/hidden_danger_government/acceptance/acceptance',
-                  query: { HIDDEN_ID: row.HIDDEN_ID },
+                  query: {
+                    HIDDEN_ID: row.HIDDEN_ID,
+                    LIST_TYPE: row.LIST_TYPE,
+                  },
                 })
               "
             >
@@ -114,7 +120,7 @@ import { useRouter } from "vue-router";
 import { serialNumber, translationStatus } from "@/assets/js/utils";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
 import useListData from "@/assets/js/useListData.js";
-import { getHiddenDangerList } from "@/request/hidden_danger_government.js";
+import { getHiddenDangerListAll } from "@/request/hidden_danger_government.js";
 import { useUserStore } from "@/pinia/user.js";
 
 const stateList = [
@@ -127,7 +133,7 @@ const router = useRouter();
 const userStore = useUserStore();
 const USER_ID = userStore.getUserInfo.USER_ID;
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
-  useListData(getHiddenDangerList, {
+  useListData(getHiddenDangerListAll, {
     otherParams: { HIDDENLEVEL: "hiddenLevel0001", DISPOSESTATE: "3" },
     callbackFn: (list) => {
       for (let i = 0; i < list.length; i++) {
diff --git a/src/views/hidden_danger_government/ledger/index.vue b/src/views/hidden_danger_government/ledger/index.vue
index 9285f07..436f6f8 100644
--- a/src/views/hidden_danger_government/ledger/index.vue
+++ b/src/views/hidden_danger_government/ledger/index.vue
@@ -127,7 +127,10 @@
               @click="
                 router.push({
                   path: '/hidden_danger_government/ledger/view',
-                  query: { HIDDEN_ID: row.HIDDEN_ID },
+                  query: {
+                    HIDDEN_ID: row.HIDDEN_ID,
+                    LIST_TYPE: row.LIST_TYPE,
+                  },
                 })
               "
             >
@@ -138,7 +141,7 @@
               type="primary"
               text
               link
-              @click="fnDelete(row.HIDDEN_ID)"
+              @click="fnDelete(row.HIDDEN_ID, row.LIST_TYPE)"
             >
               删除
             </el-button>
@@ -168,13 +171,16 @@
 <script setup>
 import { useRouter } from "vue-router";
 import { serialNumber, translationStatus } from "@/assets/js/utils";
-import { setHiddenDangerDelete } from "@/request/hazard_investigation.js";
+import {
+  setCustomHiddenDangerDelete,
+  setHiddenDangerDelete,
+} from "@/request/hazard_investigation.js";
 import { debounce } from "throttle-debounce";
 import { ElMessage, ElMessageBox } from "element-plus";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
 import useListData from "@/assets/js/useListData.js";
 import LayoutDepartment from "@/components/department/index.vue";
-import { getHiddenDangerList } from "@/request/hidden_danger_government.js";
+import { getHiddenDangerListAll } from "@/request/hidden_danger_government.js";
 import ExportExcel from "./components/export_excel.vue";
 import { reactive } from "vue";
 
@@ -192,7 +198,7 @@ const data = reactive({
   },
 });
 const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
-  useListData(getHiddenDangerList, {
+  useListData(getHiddenDangerListAll, {
     otherParams: {
       HIDDENLEVEL: "hiddenLevel0001",
       DISPOSESTATE: "-1",
@@ -216,9 +222,11 @@ const fnResetPaginationTransfer = () => {
 const buttonJurisdiction = await useButtonJurisdiction("hidden");
 const fnDelete = debounce(
   1000,
-  async (HIDDEN_ID) => {
+  async (HIDDEN_ID, LIST_TYPE) => {
     await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
-    await setHiddenDangerDelete({ HIDDEN_ID });
+    LIST_TYPE === "1"
+      ? await setHiddenDangerDelete({ HIDDEN_ID })
+      : await setCustomHiddenDangerDelete({ HIDDEN_ID });
     ElMessage.success("删除成功");
     fnResetPaginationTransfer();
   },
diff --git a/src/views/hidden_danger_government/major/index.vue b/src/views/hidden_danger_government/major/index.vue
index a97b1d9..9397714 100644
--- a/src/views/hidden_danger_government/major/index.vue
+++ b/src/views/hidden_danger_government/major/index.vue
@@ -92,7 +92,10 @@
               @click="
                 router.push({
                   path: '/hidden_danger_government/major/view',
-                  query: { HIDDEN_ID: row.HIDDEN_ID },
+                  query: {
+                    HIDDEN_ID: row.HIDDEN_ID,
+                    LIST_TYPE: row.LIST_TYPE,
+                  },
                 })
               "
             >
@@ -103,7 +106,7 @@
               type="primary"
               text
               link
-              @click="fnConfirm(row.HIDDEN_ID)"
+              @click="fnConfirm(row.HIDDEN_ID, row.LIST_TYPE)"
             >
               确定
             </el-button>
@@ -119,7 +122,7 @@ import { useRouter } from "vue-router";
 import { serialNumber, translationStatus } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import {
-  getHiddenDangerList,
+  getHiddenDangerListAll,
   setHiddenDangerCancelMajorHazards,
 } from "@/request/hidden_danger_government.js";
 import { useUserStore } from "@/pinia/user.js";
@@ -135,7 +138,7 @@ const router = useRouter();
 const userStore = useUserStore();
 const ISMAIN = userStore.getUserInfo.ISMAIN;
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
-  useListData(getHiddenDangerList, {
+  useListData(getHiddenDangerListAll, {
     otherParams: { HIDDENLEVEL: "hiddenLevel0002", DISPOSESTATE: "1" },
   });
 const fnGetDataTransfer = () => {
@@ -150,7 +153,7 @@ const fnResetPaginationTransfer = () => {
     ENDTIME: searchForm.value.dates?.[1],
   });
 };
-const fnConfirm = async (HIDDEN_ID) => {
+const fnConfirm = async (HIDDEN_ID, LIST_TYPE) => {
   try {
     await ElMessageBox.confirm("请确认该隐患是否为重大隐患？", {
       type: "warning",
@@ -160,7 +163,7 @@ const fnConfirm = async (HIDDEN_ID) => {
     });
     await router.push({
       path: "/hidden_danger_government/major/view",
-      query: { HIDDEN_ID, type: "confirm" },
+      query: { HIDDEN_ID, type: "confirm", LIST_TYPE },
     });
   } catch (event) {
     if (event === "cancel") {
diff --git a/src/views/hidden_danger_government/major/view.vue b/src/views/hidden_danger_government/major/view.vue
index 0a53978..d94ca9a 100644
--- a/src/views/hidden_danger_government/major/view.vue
+++ b/src/views/hidden_danger_government/major/view.vue
@@ -1,7 +1,7 @@
 <template>
   <layout-card>
     <div id="printContent">
-      <layout-hidden-view :hidden-id="HIDDEN_ID" />
+      <layout-hidden-view :hidden-id="HIDDEN_ID" :list-type="LIST_TYPE" />
     </div>
     <div class="tc mt-10">
       <el-button v-if="type === 'confirm'" type="primary" @click="fnConfirm">
@@ -19,18 +19,26 @@ import LayoutHiddenView from "@/components/hidden_view/index.vue";
 import { useRoute, useRouter } from "vue-router";
 import { debounce } from "throttle-debounce";
 import { ElMessage } from "element-plus";
-import { setHiddenDangerConfirmMajorHazards } from "@/request/hidden_danger_government.js";
+import {
+  setCustomHiddenDangerConfirmMajorHazards,
+  setHiddenDangerConfirmMajorHazards,
+} from "@/request/hidden_danger_government.js";
 
 const route = useRoute();
 const router = useRouter();
-const { HIDDEN_ID, type } = route.query;
+const { HIDDEN_ID, type, LIST_TYPE } = route.query;
 const fnConfirm = debounce(
   1000,
   async () => {
-    await setHiddenDangerConfirmMajorHazards({
-      ISCONFIRM: "1",
-      HIDDEN_ID,
-    });
+    LIST_TYPE === "1"
+      ? await setHiddenDangerConfirmMajorHazards({
+          ISCONFIRM: "1",
+          HIDDEN_ID,
+        })
+      : await setCustomHiddenDangerConfirmMajorHazards({
+          ISCONFIRM: "1",
+          HIDDEN_ID,
+        });
     ElMessage.success("确认成功");
     router.back();
   },
diff --git a/src/views/hidden_danger_government/rectification/index.vue b/src/views/hidden_danger_government/rectification/index.vue
index 74d8b32..b36f8a0 100644
--- a/src/views/hidden_danger_government/rectification/index.vue
+++ b/src/views/hidden_danger_government/rectification/index.vue
@@ -92,7 +92,10 @@
               @click="
                 router.push({
                   path: '/hidden_danger_government/rectification/view',
-                  query: { HIDDEN_ID: row.HIDDEN_ID },
+                  query: {
+                    HIDDEN_ID: row.HIDDEN_ID,
+                    LIST_TYPE: row.LIST_TYPE,
+                  },
                 })
               "
             >
@@ -119,7 +122,7 @@ import { useRouter } from "vue-router";
 import { serialNumber, translationStatus } from "@/assets/js/utils";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
 import useListData from "@/assets/js/useListData.js";
-import { getHiddenDangerList } from "@/request/hidden_danger_government.js";
+import { getHiddenDangerListAll } from "@/request/hidden_danger_government.js";
 import { ElMessage } from "element-plus";
 
 const stateList = [
@@ -130,7 +133,7 @@ const stateList = [
 ];
 const router = useRouter();
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
-  useListData(getHiddenDangerList, {
+  useListData(getHiddenDangerListAll, {
     otherParams: { HIDDENLEVEL: "hiddenLevel0001", DISPOSESTATE: "2" },
   });
 const fnGetDataTransfer = () => {
@@ -153,7 +156,7 @@ const fnRectification = (row) => {
   }
   router.push({
     path: "/hidden_danger_government/rectification/rectification",
-    query: { HIDDEN_ID: row.HIDDEN_ID },
+    query: { HIDDEN_ID: row.HIDDEN_ID, LIST_TYPE: row.LIST_TYPE },
   });
 };
 </script>
diff --git a/src/views/hidden_danger_government/rectification/rectification.vue b/src/views/hidden_danger_government/rectification/rectification.vue
index 01497ac..5557ca1 100644
--- a/src/views/hidden_danger_government/rectification/rectification.vue
+++ b/src/views/hidden_danger_government/rectification/rectification.vue
@@ -2,6 +2,7 @@
   <layout-card>
     <layout-hidden-view
       :hidden-id="HIDDEN_ID"
+      :list-type="LIST_TYPE"
       @throw-data="data.info = $event"
     />
     <el-divider content-position="left">隐患整改</el-divider>
@@ -304,6 +305,8 @@ import LayoutUpload from "@/components/upload/index.vue";
 import { useUserStore } from "@/pinia/user.js";
 import {
   getHiddenDangerRectificationWhy,
+  setCustomHiddenDangerRectificationAbnormalSubmit,
+  setCustomHiddenDangerRectificationNormalSubmit,
   setHiddenDangerRectificationAbnormalSubmit,
   setHiddenDangerRectificationNormalSubmit,
 } from "@/request/hidden_danger_government.js";
@@ -320,7 +323,7 @@ const router = useRouter();
 const userStore = useUserStore();
 const USER_ID = userStore.getUserInfo.USER_ID;
 const CORPINFO_ID = userStore.getUserInfo.CORPINFO_ID;
-const { HIDDEN_ID } = route.query;
+const { HIDDEN_ID, LIST_TYPE } = route.query;
 const formRef = ref(null);
 const rules = {
   IS_NORMAL: [
@@ -514,13 +517,21 @@ const fnSubmit = debounce(
       formData.delete("programmeFile");
       formData.delete("planFile");
       formData.delete("acceptanceList");
-      await setHiddenDangerRectificationNormalSubmit(formData);
+      LIST_TYPE === "1"
+        ? await setHiddenDangerRectificationNormalSubmit(formData)
+        : await setCustomHiddenDangerRectificationNormalSubmit(formData);
     } else {
-      await setHiddenDangerRectificationAbnormalSubmit({
-        HIDDEN_ID,
-        RECTIFICATIONOR: data.form.RECTIFICATIONOR,
-        RECTIFICATIONDEPT: data.form.RECTIFICATIONDEPT,
-      });
+      LIST_TYPE === "1"
+        ? await setHiddenDangerRectificationAbnormalSubmit({
+            HIDDEN_ID,
+            RECTIFICATIONOR: data.form.RECTIFICATIONOR,
+            RECTIFICATIONDEPT: data.form.RECTIFICATIONDEPT,
+          })
+        : await setCustomHiddenDangerRectificationAbnormalSubmit({
+            HIDDEN_ID,
+            RECTIFICATIONOR: data.form.RECTIFICATIONOR,
+            RECTIFICATIONDEPT: data.form.RECTIFICATIONDEPT,
+          });
     }
     ElMessage.success("保存成功");
     router.back();
diff --git a/src/views/troubleshooting_statistics/day_inspection/index.vue b/src/views/troubleshooting_statistics/day_inspection/index.vue
index f7e500d..d179567 100644
--- a/src/views/troubleshooting_statistics/day_inspection/index.vue
+++ b/src/views/troubleshooting_statistics/day_inspection/index.vue
@@ -15,6 +15,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="清单种类" prop="LIST_TYPE">
+              <el-select v-model="searchForm.LIST_TYPE">
+                <el-option label="风险管控清单" value="1" />
+                <el-option label="隐患排查清单" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="人员" prop="USERNAME">
               <el-input
@@ -96,6 +104,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="NAME" label="清单名称" />
+        <el-table-column prop="LIST_TYPE" label="清单种类">
+          <template #default="{ row }">
+            <span v-if="row.LIST_TYPE === '1'">风险管控清单</span>
+            <span v-if="row.LIST_TYPE === '2'">隐患排查清单</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="DEPARTMENT_NAME_ALL" label="部门" />
         <el-table-column prop="POST_NAME" label="岗位" />
         <el-table-column prop="USER_NAME" label="人员" width="100" />
@@ -125,7 +139,10 @@
               @click="
                 router.push({
                   path: `/troubleshooting_statistics/${type}_inspection/inspection_records`,
-                  query: { LISTMANAGER_ID: row.LISTMANAGER_ID },
+                  query: {
+                    LISTMANAGER_ID: row.LISTMANAGER_ID,
+                    LIST_TYPE: row.LIST_TYPE,
+                  },
                 })
               "
             >
diff --git a/src/views/troubleshooting_statistics/day_inspection/inspection_records.vue b/src/views/troubleshooting_statistics/day_inspection/inspection_records.vue
index 40eabfe..0c57621 100644
--- a/src/views/troubleshooting_statistics/day_inspection/inspection_records.vue
+++ b/src/views/troubleshooting_statistics/day_inspection/inspection_records.vue
@@ -43,16 +43,18 @@
             <div>排查人员：{{ info.USER_NAME }}</div>
             <div>排查频次：每天</div>
           </div>
-          <table class="print_table">
+          <table v-if="LIST_TYPE === '1'" class="print_table">
             <thead>
               <tr>
-                <th width="60" class="title">序号</th>
-                <th width="150" class="title">风险单元</th>
-                <th width="150" class="title">排查部位</th>
-                <th width="500" class="title">风险管控措施</th>
-                <th width="500" class="title">风险失控表现（问题隐患）</th>
-                <th width="150" class="title">失职部门和人员</th>
-                <th width="150" class="title">排查责任人</th>
+                <th style="width: 50px" class="title">序号</th>
+                <th style="width: 150px" class="title">风险单元</th>
+                <th style="width: 150px" class="title">排查部位</th>
+                <th style="width: 150px" class="title">风险管控措施</th>
+                <th style="width: 150px" class="title">
+                  风险失控表现（问题隐患）
+                </th>
+                <th style="width: 150px" class="title">失职部门和人员</th>
+                <th style="width: 150px" class="title">排查责任人</th>
               </tr>
             </thead>
             <tbody>
@@ -67,6 +69,32 @@
               </tr>
             </tbody>
           </table>
+          <table v-if="LIST_TYPE === '2'" class="print_table">
+            <thead>
+              <tr>
+                <th style="width: 50px" class="title">序号</th>
+                <th style="width: 150px" class="title">检查类别</th>
+                <th style="width: 150px" class="title">检查项目</th>
+                <th style="width: 150px" class="title">检查内容</th>
+                <th style="width: 150px" class="title">检查标准</th>
+                <th style="width: 150px" class="title">参考依据</th>
+                <th style="width: 150px" class="title">失职部门和人员</th>
+                <th style="width: 150px" class="title">排查责任人</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in list" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.CHECK_CATEGORY_NAME }}</td>
+                <td>{{ item.CHECK_ITEM_NAME }}</td>
+                <td>{{ item.CHECK_CONTENT }}</td>
+                <td>{{ item.CHECK_STANDARD }}</td>
+                <td>{{ item.REFERENCE_BASIS }}</td>
+                <td>{{ item.DEPARTMENT_NAME }}/{{ item.USER_NAME }}</td>
+                <td>{{ info.DEPARTMENT_NAME }}/{{ info.USER_NAME }}</td>
+              </tr>
+            </tbody>
+          </table>
         </div>
         <div class="tc">
           <h3>日常隐患排查表</h3>
@@ -143,28 +171,39 @@
 
 <script setup>
 import { useRoute } from "vue-router";
-import { getChecklistInspectionRecordDayInspectionList } from "@/request/troubleshooting_statistics.js";
+import {
+  getChecklistInspectionRecordDayInspectionList,
+  getCustomChecklistInspectionRecordDayInspectionList,
+} from "@/request/troubleshooting_statistics.js";
 import useListData from "@/assets/js/useListData.js";
 import dayjs from "dayjs";
 import { ref } from "vue";
 import { PRINT_STYLE } from "@/assets/js/constant.js";
 
 const route = useRoute();
-const { LISTMANAGER_ID } = route.query;
+const { LISTMANAGER_ID, LIST_TYPE } = route.query;
 const info = ref({});
 const recordList = ref([]);
-const { list, searchForm, fnGetData } = useListData(
-  getChecklistInspectionRecordDayInspectionList,
-  {
-    otherParams: { LISTMANAGER_ID },
-    defaultSearchForm: { YEAR: dayjs().format("YYYY") },
-    usePagination: false,
-    callbackFn: (list, resData) => {
-      info.value = resData.pd;
-      recordList.value = resData.recordList;
-    },
-  }
-);
+const { list, searchForm, fnGetData } =
+  LIST_TYPE === "1"
+    ? useListData(getChecklistInspectionRecordDayInspectionList, {
+        otherParams: { LISTMANAGER_ID },
+        defaultSearchForm: { YEAR: dayjs().format("YYYY") },
+        usePagination: false,
+        callbackFn: (list, resData) => {
+          info.value = resData.pd;
+          recordList.value = resData.recordList;
+        },
+      })
+    : useListData(getCustomChecklistInspectionRecordDayInspectionList, {
+        otherParams: { CUSTOM_ID: LISTMANAGER_ID },
+        defaultSearchForm: { YEAR: dayjs().format("YYYY") },
+        usePagination: false,
+        callbackFn: (list, resData) => {
+          info.value = resData.pd;
+          recordList.value = resData.recordList;
+        },
+      });
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/troubleshooting_statistics/ten_day_inspection/inspection_records.vue b/src/views/troubleshooting_statistics/ten_day_inspection/inspection_records.vue
index 112d018..ac74dcb 100644
--- a/src/views/troubleshooting_statistics/ten_day_inspection/inspection_records.vue
+++ b/src/views/troubleshooting_statistics/ten_day_inspection/inspection_records.vue
@@ -42,16 +42,18 @@
           >
             <div>排查部门：{{ info.DEPARTMENT_NAME }}</div>
           </div>
-          <table class="print_table">
+          <table v-if="LIST_TYPE === '1'" class="print_table">
             <thead>
               <tr>
-                <th width="60" class="title">序号</th>
-                <th width="150" class="title">风险单元</th>
-                <th width="150" class="title">排查部位</th>
-                <th width="500" class="title">风险管控措施</th>
-                <th width="500" class="title">风险失控表现（问题隐患）</th>
-                <th width="150" class="title">失职部门和人员</th>
-                <th width="150" class="title">排查责任人</th>
+                <th style="width: 50px" class="title">序号</th>
+                <th style="width: 150px" class="title">风险单元</th>
+                <th style="width: 150px" class="title">排查部位</th>
+                <th style="width: 150px" class="title">风险管控措施</th>
+                <th style="width: 150px" class="title">
+                  风险失控表现（问题隐患）
+                </th>
+                <th style="width: 150px" class="title">失职部门和人员</th>
+                <th style="width: 150px" class="title">排查责任人</th>
               </tr>
             </thead>
             <tbody>
@@ -66,6 +68,32 @@
               </tr>
             </tbody>
           </table>
+          <table v-if="LIST_TYPE === '2'" class="print_table">
+            <thead>
+              <tr>
+                <th style="width: 50px" class="title">序号</th>
+                <th style="width: 150px" class="title">检查类别</th>
+                <th style="width: 150px" class="title">检查项目</th>
+                <th style="width: 150px" class="title">检查内容</th>
+                <th style="width: 150px" class="title">检查标准</th>
+                <th style="width: 150px" class="title">参考依据</th>
+                <th style="width: 150px" class="title">失职部门和人员</th>
+                <th style="width: 150px" class="title">排查责任人</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in list" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.CHECK_CATEGORY_NAME }}</td>
+                <td>{{ item.CHECK_ITEM_NAME }}</td>
+                <td>{{ item.CHECK_CONTENT }}</td>
+                <td>{{ item.CHECK_STANDARD }}</td>
+                <td>{{ item.REFERENCE_BASIS }}</td>
+                <td>{{ item.DEPARTMENT_NAME }}/{{ item.USER_NAME }}</td>
+                <td>{{ info.DEPARTMENT_NAME }}/{{ info.USER_NAME }}</td>
+              </tr>
+            </tbody>
+          </table>
         </div>
         <div class="tc">
           <h3>{{ YEAR }}年旬检清单排查表</h3>
@@ -124,30 +152,42 @@
 
 <script setup>
 import { useRoute } from "vue-router";
-import { getChecklistInspectionRecordTenDayInspectionList } from "@/request/troubleshooting_statistics.js";
+import {
+  getChecklistInspectionRecordTenDayInspectionList,
+  getCustomChecklistInspectionRecordTenDayInspectionList,
+} from "@/request/troubleshooting_statistics.js";
 import useListData from "@/assets/js/useListData.js";
 import dayjs from "dayjs";
 import { ref } from "vue";
 import { PRINT_STYLE } from "@/assets/js/constant.js";
 
 const route = useRoute();
-const { LISTMANAGER_ID } = route.query;
+const { LISTMANAGER_ID, LIST_TYPE } = route.query;
 const info = ref({});
 const recordList = ref([]);
 const YEAR = ref("");
-const { list, searchForm, fnGetData } = useListData(
-  getChecklistInspectionRecordTenDayInspectionList,
-  {
-    otherParams: { LISTMANAGER_ID },
-    defaultSearchForm: { YEAR: dayjs().format("YYYY") },
-    usePagination: false,
-    callbackFn: (list, resData) => {
-      info.value = resData.pd;
-      recordList.value = resData.recordList;
-      YEAR.value = searchForm.value.YEAR;
-    },
-  }
-);
+const { list, searchForm, fnGetData } =
+  LIST_TYPE === "1"
+    ? useListData(getChecklistInspectionRecordTenDayInspectionList, {
+        otherParams: { LISTMANAGER_ID },
+        defaultSearchForm: { YEAR: dayjs().format("YYYY") },
+        usePagination: false,
+        callbackFn: (list, resData) => {
+          info.value = resData.pd;
+          recordList.value = resData.recordList;
+          YEAR.value = searchForm.value.YEAR;
+        },
+      })
+    : useListData(getCustomChecklistInspectionRecordTenDayInspectionList, {
+        otherParams: { CUSTOM_ID: LISTMANAGER_ID },
+        defaultSearchForm: { YEAR: dayjs().format("YYYY") },
+        usePagination: false,
+        callbackFn: (list, resData) => {
+          info.value = resData.pd;
+          recordList.value = resData.recordList;
+          YEAR.value = searchForm.value.YEAR;
+        },
+      });
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/troubleshooting_statistics/week_inspection/inspection_records.vue b/src/views/troubleshooting_statistics/week_inspection/inspection_records.vue
index df6b836..aebf2c5 100644
--- a/src/views/troubleshooting_statistics/week_inspection/inspection_records.vue
+++ b/src/views/troubleshooting_statistics/week_inspection/inspection_records.vue
@@ -42,16 +42,18 @@
           >
             <div>排查部门：{{ info.DEPARTMENT_NAME }}</div>
           </div>
-          <table class="print_table">
+          <table v-if="LIST_TYPE === '1'" class="print_table">
             <thead>
               <tr>
-                <th width="60" class="title">序号</th>
-                <th width="150" class="title">风险单元</th>
-                <th width="150" class="title">排查部位</th>
-                <th width="500" class="title">风险管控措施</th>
-                <th width="500" class="title">风险失控表现（问题隐患）</th>
-                <th width="150" class="title">失职部门和人员</th>
-                <th width="150" class="title">排查责任人</th>
+                <th style="width: 50px" class="title">序号</th>
+                <th style="width: 150px" class="title">风险单元</th>
+                <th style="width: 150px" class="title">排查部位</th>
+                <th style="width: 150px" class="title">风险管控措施</th>
+                <th style="width: 150px" class="title">
+                  风险失控表现（问题隐患）
+                </th>
+                <th style="width: 150px" class="title">失职部门和人员</th>
+                <th style="width: 150px" class="title">排查责任人</th>
               </tr>
             </thead>
             <tbody>
@@ -66,6 +68,32 @@
               </tr>
             </tbody>
           </table>
+          <table v-if="LIST_TYPE === '2'" class="print_table">
+            <thead>
+              <tr>
+                <th style="width: 50px" class="title">序号</th>
+                <th style="width: 150px" class="title">检查类别</th>
+                <th style="width: 150px" class="title">检查项目</th>
+                <th style="width: 150px" class="title">检查内容</th>
+                <th style="width: 150px" class="title">检查标准</th>
+                <th style="width: 150px" class="title">参考依据</th>
+                <th style="width: 150px" class="title">失职部门和人员</th>
+                <th style="width: 150px" class="title">排查责任人</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in list" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.CHECK_CATEGORY_NAME }}</td>
+                <td>{{ item.CHECK_ITEM_NAME }}</td>
+                <td>{{ item.CHECK_CONTENT }}</td>
+                <td>{{ item.CHECK_STANDARD }}</td>
+                <td>{{ item.REFERENCE_BASIS }}</td>
+                <td>{{ item.DEPARTMENT_NAME }}/{{ item.USER_NAME }}</td>
+                <td>{{ info.DEPARTMENT_NAME }}/{{ info.USER_NAME }}</td>
+              </tr>
+            </tbody>
+          </table>
         </div>
         <div class="tc">
           <h3>{{ YEAR }}年周检清单排查表</h3>
@@ -119,30 +147,42 @@
 
 <script setup>
 import { useRoute } from "vue-router";
-import { getChecklistInspectionRecordWeekInspectionList } from "@/request/troubleshooting_statistics.js";
+import {
+  getChecklistInspectionRecordWeekInspectionList,
+  getCustomChecklistInspectionRecordWeekInspectionList,
+} from "@/request/troubleshooting_statistics.js";
 import useListData from "@/assets/js/useListData.js";
 import dayjs from "dayjs";
 import { ref } from "vue";
 import { PRINT_STYLE } from "@/assets/js/constant.js";
 
 const route = useRoute();
-const { LISTMANAGER_ID } = route.query;
+const { LISTMANAGER_ID, LIST_TYPE } = route.query;
 const info = ref({});
 const recordList = ref([]);
 const YEAR = ref("");
-const { list, searchForm, fnGetData } = useListData(
-  getChecklistInspectionRecordWeekInspectionList,
-  {
-    otherParams: { LISTMANAGER_ID },
-    defaultSearchForm: { YEAR: dayjs().format("YYYY") },
-    usePagination: false,
-    callbackFn: (list, resData) => {
-      info.value = resData.pd;
-      recordList.value = resData.recordList;
-      YEAR.value = searchForm.value.YEAR;
-    },
-  }
-);
+const { list, searchForm, fnGetData } =
+  LIST_TYPE === "1"
+    ? useListData(getChecklistInspectionRecordWeekInspectionList, {
+        otherParams: { LISTMANAGER_ID },
+        defaultSearchForm: { YEAR: dayjs().format("YYYY") },
+        usePagination: false,
+        callbackFn: (list, resData) => {
+          info.value = resData.pd;
+          recordList.value = resData.recordList;
+          YEAR.value = searchForm.value.YEAR;
+        },
+      })
+    : useListData(getCustomChecklistInspectionRecordWeekInspectionList, {
+        otherParams: { CUSTOM_ID: LISTMANAGER_ID },
+        defaultSearchForm: { YEAR: dayjs().format("YYYY") },
+        usePagination: false,
+        callbackFn: (list, resData) => {
+          info.value = resData.pd;
+          recordList.value = resData.recordList;
+          YEAR.value = searchForm.value.YEAR;
+        },
+      });
 </script>
 
 <style scoped lang="scss">