Merge branch 'feat/production-safety' of http://14.103.151.10:8888/product-group-fe/sfy-safety-group/sfy-safety into feat/production-safety

src/router/routers/production-safety-router/hiddenTroubleInvestigationAndGovernance.ts

@@ -267,62 +267,62 @@
           noCache: false,
         },
       },
-      // {
-      //   id: 900409,
-      //   parentId: 9004,
-      //   name: 'areaCheckPlanTask',
-      //   path: 'area-check-plan-task',
-      //   component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/areaCheckPlanTask',
-      //   meta: {
-      //     title: '区域检查计划任务(管理员)',
-      //     icon: 'OverviewIcon',
-      //     isRoot: false,
-      //     hidden: false,
-      //     noCache: false,
-      //   },
-      // },
-      // {
-      //   id: 90040901,
-      //   parentId: 900409,
-      //   name: 'areaCheckPlanTaskItem',
-      //   path: 'area-check-plan-task-item',
-      //   component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/areaCheckPlanTaskItem',
-      //   meta: {
-      //     title: '区域检查计划任务(管理员)详情',
-      //     icon: 'OverviewIcon',
-      //     isRoot: false,
-      //     hidden: true,
-      //     noCache: false,
-      //   },
-      // },
-      // {
-      //   id: 900409,
-      //   parentId: 9004,
-      //   name: 'areaCheckPlanTaskDept',
-      //   path: 'area-check-plan-task-dept',
-      //   component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTaskDept/areaCheckPlanTaskDept',
-      //   meta: {
-      //     title: '区域检查计划任务(部门)',
-      //     icon: 'OverviewIcon',
-      //     isRoot: false,
-      //     hidden: false,
-      //     noCache: false,
-      //   },
-      // },
-      // {
-      //   id: 90040901,
-      //   parentId: 900409,
-      //   name: 'areaCheckPlanTaskDeptItem',
-      //   path: 'area-check-plan-task-dept-item',
-      //   component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTaskDept/areaCheckPlanTaskDeptItem',
-      //   meta: {
-      //     title: '区域检查计划任务(部门)详情',
-      //     icon: 'OverviewIcon',
-      //     isRoot: false,
-      //     hidden: true,
-      //     noCache: false,
-      //   },
-      // },
+      {
+        id: 900409,
+        parentId: 9004,
+        name: 'areaCheckPlanTask',
+        path: 'area-check-plan-task',
+        component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/areaCheckPlanTask',
+        meta: {
+          title: '区域检查计划任务(管理员)',
+          icon: 'OverviewIcon',
+          isRoot: false,
+          hidden: false,
+          noCache: false,
+        },
+      },
+      {
+        id: 90040901,
+        parentId: 900409,
+        name: 'areaCheckPlanTaskItem',
+        path: 'area-check-plan-task-item',
+        component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/areaCheckPlanTaskItem',
+        meta: {
+          title: '区域检查计划任务(管理员)详情',
+          icon: 'OverviewIcon',
+          isRoot: false,
+          hidden: true,
+          noCache: false,
+        },
+      },
+      {
+        id: 900409,
+        parentId: 9004,
+        name: 'areaCheckPlanTaskDept',
+        path: 'area-check-plan-task-dept',
+        component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTaskDept/areaCheckPlanTaskDept',
+        meta: {
+          title: '区域检查计划任务(部门)',
+          icon: 'OverviewIcon',
+          isRoot: false,
+          hidden: false,
+          noCache: false,
+        },
+      },
+      {
+        id: 90040901,
+        parentId: 900409,
+        name: 'areaCheckPlanTaskDeptItem',
+        path: 'area-check-plan-task-dept-item',
+        component: '/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTaskDept/areaCheckPlanTaskDeptItem',
+        meta: {
+          title: '区域检查计划任务(部门)详情',
+          icon: 'OverviewIcon',
+          isRoot: false,
+          hidden: true,
+          noCache: false,
+        },
+      },
     ],
 }];
 

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/areaCheckPlanTask.vue

@@ -6,17 +6,17 @@
     <main class="safety-platform-container__main">
       <div class="search-table-container">
         <header>
-          <div style="position: relative">
+          <!-- <div style="position: relative">
             <el-button plain class="search-table-container--button" @click="handleImport"> 导入 </el-button>
-          </div>
+          </div> -->
 
           <div class="act-search">
             <section class="select-box">
               <div class="select-box--item">
                 <span>检查场所/检查人员：</span>
                 <el-input
-                  v-model="tableQuery.queryParam.keyword"
-                  placeholder="搜索检查场所或计划名称"
+                  v-model="tableQuery.queryParam.searchKey"
+                  placeholder="搜索检查场所或检查人员"
                   class="act-search-input"
                   style="min-width: 200px;"
                   clearable
@@ -70,20 +70,31 @@
                scope.row.status === 0 ? '-' : scope.row.needOverallDesc === true ? '是' : scope.row.needOverallDesc === false ? '否' : '-'
               }}</span>
             </template>
-            <template #primaryResponsibleDeptName="scope">
-                    <!-- 如果有下发按钮就展示原来的字段primaryResponsibleDeptName，没有下发按钮就展示responsibleDeptName -->
-                    {{ Number(scope.row.status) === 0 ? scope.row.primaryResponsibleDeptName: scope.row.responsibleDeptName}}
+            <template #sign="scope">
+            <div class="file-list">
+                  <div class="file-item" v-for="item in scope.row.checkedPersonSign" :key="item.fileId">
+                    <span class="file-item--name">{{ item.fileName }}</span>
+                    <div class="file-item--footer">
+                      <el-button link type="primary" @click="previewOnline(item.fileUrl, item.fileType)"
+                        >预览</el-button
+                      >
+                      <el-button link type="primary" @click.stop="downloadFile(item.fileUrl, item.fileName)"
+                        >下载</el-button
+                      >
+                    </div>
+                  </div>
+                </div>
             </template>
             <template #needSigneeSign="scope">
               <span>{{
                 scope.row.status === 0 ? '-' : scope.row.needSigneeSign === true ? '是' : scope.row.needSigneeSign === false ? '否' : '-'
               }}</span>
             </template>
-            <template #planStartTime="scope">
-              <span>{{ scope.row.planStartTime ?? '-' }}</span>
+            <template #startDate="scope">
+              <span>{{ scope.row.startDate ?? '-' }}</span>
             </template>
-            <template #planEndTime="scope">
-              <span>{{ scope.row.planEndTime ?? '-' }}</span>
+            <template #endDate="scope">
+              <span>{{ scope.row.endDate ?? '-' }}</span>
             </template>
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">
@@ -117,11 +128,7 @@
   import type { QueryPageRequest } from '@/types/basic-query';
   import type { AreaCheckPlanQuery, AreaCheckPlanRecord } from './configs/types';
   import {
-    queryAreaCheckPlanManagePage,
-    deleteAreaCheckPlanManage,
-    sendAreaCheckPlanToDep,
-    cancelAreaCheckPlanManage,
-    queryAreaCheckPlanManageDetail,
+    queryAreaCheckPlanDetailPage,
     mapAreaCheckPlanApiRecordToUi,
     exportAreaCheckPlanAdministration,
   } from '@/api/production-safety-system';
@@ -133,6 +140,7 @@
   import { useGlobSetting } from '@/hooks/setting';
   import urlJoin from 'url-join';
   import { downloadByData } from '@/utils/file/download';
+  import { downloadFile } from '@/views/disaster/utils';
   const router = useRouter();
 
   const basicTableRef = ref<InstanceType<typeof BasicTable>>();
@@ -143,184 +151,31 @@
   // 场所所属类别选项（示例数据，本页面不调用接口）
   const venueCategoryOptions = ref<Array<{ label: string; value: string }>>([]);
 
-  // 下发弹窗
-  const showIssueDialog = ref(false);
-  const currentIssuePlanId = ref<number | null>(null);
-  const issueFormRef = ref();
-  const issueResponsibleDeptCascaderRef = ref();
-  const issueForm = reactive({
-    responsibleDeptIds: [] as number[],
-    responsibleDeptPersonnelGroupCode: undefined as string | undefined,
-    safetyEmergencyDeptId: undefined as number | undefined,
-    safetyEmergencyGroupId: undefined as number | undefined,
-    hospitalLeaderDeptId: undefined as number | undefined,
-    hospitalLeaderGroupId: undefined as number | undefined,
-    planStartTime: '',
-    planEndTime: '',
-    needOverallDesc: false,
-    needSigneeSign: false,
-  });
-  const issueRules = {
-    responsibleDeptIds: [{ required: true, message: '请选择责任部门', trigger: 'change', type: 'array', min: 1 }],
-    responsibleDeptPersonnelGroupCode: [{ required: true, message: '请选择责任部门人员分组', trigger: 'change' }],
-    safetyEmergencyDeptId: [{ required: true, message: '请选择安全应急部门', trigger: 'change' }],
-    safetyEmergencyGroupId: [{ required: true, message: '请选择安全应急部人员分组', trigger: 'change' }],
-    hospitalLeaderDeptId: [{ required: true, message: '请选择院领导部门', trigger: 'change' }],
-    hospitalLeaderGroupId: [{ required: true, message: '请选择院领导人员分组', trigger: 'change' }],
-    planStartTime: [{ required: true, message: '请选择计划开始日期', trigger: 'change' }],
-    planEndTime: [{ required: true, message: '请选择计划结束时间', trigger: 'change' }],
-    needOverallDesc: [{ required: true, message: '请选择是否需要整体检查情况描述', trigger: 'change' }],
-    needSigneeSign: [{ required: true, message: '请选择是否需要被检查人签字', trigger: 'change' }],
-  };
-  // 下发弹窗：责任部门/安全应急部门/院领导部门复用新增区域检查计划的主责部门下拉（getAllDepartments）
-  const issueDeptTree = ref<DeptTree[]>([]);
-  const issueDeptTreeTow = ref<DeptTree[]>([]);
-  const cascaderDeptProp = {
-    checkStrictly: true,
-    expandTrigger: 'hover' as const,
-    value: 'id',
-    label: 'deptName',
-    emitPath: false,
-  };
-  const cascaderDeptPropMultiple = {
-    ...cascaderDeptProp,
-    multiple: true,
-  };
-  // 责任部门人员分组/安全应急部人员分组/院领导人员分组复用 queryUserGroupPage 查询用户分组接口
-  const userGroupOptions = ref<PersonGroupListItem[]>([]);
-
-  /** 下发弹窗打开时加载部门树（与新增区域检查计划主责部门一致） */
-  const loadIssueDeptTree = async () => {
-    try {
-      const res = await getAllDepartments();
-      issueDeptTree.value = res?.[0]?.children ?? [];
-      issueDeptTreeTow.value = res?.[0]?.children.map(item => ({
-        ...item,
-        children: []
-      }));
-    } catch (e) {
-      console.error('获取部门树失败:', e);
-      issueDeptTree.value = [];
-    }
-  };
-
-  /** 下发弹窗打开时加载用户分组列表 */
-  const loadUserGroupOptions = async () => {
-    try {
-      const res = await queryUserGroupPage({
-        pageNumber: 1,
-        pageSize: 9999,
-        queryParam: '',
-      });
-      userGroupOptions.value = res?.records ?? [];
-    } catch (e) {
-      console.error('获取用户分组列表失败:', e);
-      userGroupOptions.value = [];
-    }
-  };
 
-  const onIssueDialogOpen = async () => {
-    await Promise.all([loadIssueDeptTree(), loadUserGroupOptions()]);
 
-    if (!currentIssuePlanId.value) return;
 
-    try {
-      const raw = await queryAreaCheckPlanManageDetail(currentIssuePlanId.value);
-      const detail = mapAreaCheckPlanApiRecordToUi(raw);
-
-      const responsibleDeptIdsByCode = parseNumberList(
-        detail.primaryResponsibleDeptCode ?? (detail as Record<string, unknown>).responsibleDeptCode,
-      );
-
-      issueForm.responsibleDeptIds = responsibleDeptIdsByCode.length
-        ? responsibleDeptIdsByCode
-        : (detail.primaryResponsibleDeptName || '')
-            .split(',')
-            .map((name) => findDeptIdByName(issueDeptTree.value, name.trim()))
-            .filter((id): id is number => id != null);
-
-      const safetyEmergencyDeptIdByCode = parseNumber(detail.safetyEmergencyDeptCode);
-      issueForm.safetyEmergencyDeptId =
-        safetyEmergencyDeptIdByCode ?? findDeptIdByName(issueDeptTree.value, detail.safetyEmergencyDeptName);
-
-      const hospitalLeaderDeptIdByCode = parseNumber(detail.hospitalLeaderDeptCode);
-      issueForm.hospitalLeaderDeptId =
-        hospitalLeaderDeptIdByCode ?? findDeptIdByName(issueDeptTree.value, detail.hospitalLeaderDeptName);
-    } catch (e) {
-      console.error('加载下发默认数据失败:', e);
-    }
-  };
 
-  const findDeptNameById = (nodes: DeptTree[] | undefined, id: number | undefined): string | undefined => {
-    if (!nodes?.length || id == null) return undefined;
-    for (const n of nodes) {
-      if (n.id === id) return n.deptName;
-      const found = findDeptNameById(n.children, id);
-      if (found) return found;
+  const previewOnline = (url: string | undefined, type) => {
+    if (url) {
+      previewOnlineRef.value?.open(url, type);
     }
-    return undefined;
   };
 
-  const findDeptIdByName = (nodes: DeptTree[] | undefined, name: string | undefined): number | undefined => {
-    if (!nodes?.length || !name) return undefined;
-    for (const n of nodes) {
-      if (n.deptName === name) return n.id ?? undefined;
-      const found = findDeptIdByName(n.children, name);
-      if (found != null) return found;
-    }
-    return undefined;
-  };
 
-  const parseNumber = (val: unknown): number | undefined => {
-    if (val == null || val === '') return undefined;
-    const n = Number(val);
-    return Number.isFinite(n) ? n : undefined;
-  };
 
-  const parseNumberList = (val: unknown): number[] => {
-    if (val == null || val === '') return [];
-    return String(val)
-      .split(',')
-      .map((s) => parseNumber(s.trim()))
-      .filter((n): n is number => n != null);
-  };
 
-  const findDeptNamesByIds = (nodes: DeptTree[] | undefined, ids: number[] | undefined): string[] => {
-    const list = (ids ?? []).filter((v) => v != null);
-    if (!list.length) return [];
-    return list
-      .map((id) => findDeptNameById(nodes, id))
-      .filter((name): name is string => !!name && String(name).trim().length > 0);
-  };
 
-  const findGroupNameById = (id: number | undefined): string | undefined => {
-    if (id == null) return undefined;
-    return userGroupOptions.value.find((g) => g.id === id)?.name;
-  };
 
-  const resetIssueForm = () => {
-    issueForm.responsibleDeptIds = [];
-    issueForm.responsibleDeptPersonnelGroupCode = undefined;
-    issueForm.safetyEmergencyDeptId = undefined;
-    issueForm.safetyEmergencyGroupId = undefined;
-    issueForm.hospitalLeaderDeptId = undefined;
-    issueForm.hospitalLeaderGroupId = undefined;
-    issueForm.planStartTime = '';
-    issueForm.planEndTime = '';
-    issueForm.needOverallDesc = false;
-    issueForm.needSigneeSign = false;
-    issueFormRef.value?.resetFields?.();
-  };
 
   const tableQuery = reactive<QueryPageRequest<AreaCheckPlanQuery>>({
     pageNumber: pagination.pageNumber,
     pageSize: pagination.pageSize,
     queryParam: {
-      keyword: '',
+      searchKey: '',
       status: '' as AreaCheckPlanQuery['status'],
       venueCategory: '',
-      planStartTime: '',
-      planEndTime: '',
+      startDate: '',
+      endDate: '',
     },
   });
 
@@ -339,7 +194,7 @@
   async function getTableData() {
     tableConfig.loading = true;
     try {
-      const res = await queryAreaCheckPlanManagePage({
+      const res = await queryAreaCheckPlanDetailPage({
         pageNumber: tableQuery.pageNumber,
         pageSize: tableQuery.pageSize,
         queryParam: tableQuery.queryParam,
@@ -359,11 +214,11 @@
 
   const handleSearch = () => {
     if (dateRange.value && dateRange.value.length === 2) {
-      tableQuery.queryParam.planStartTime = dateRange.value[0];
-      tableQuery.queryParam.planEndTime = dateRange.value[1];
+      tableQuery.queryParam.startDate = dateRange.value[0];
+      tableQuery.queryParam.endDate = dateRange.value[1];
     } else {
-      tableQuery.queryParam.planStartTime = '';
-      tableQuery.queryParam.planEndTime = '';
+      tableQuery.queryParam.startDate = '';
+      tableQuery.queryParam.endDate = '';
     }
     pagination.pageNumber = 1;
     tableQuery.pageNumber = 1;
@@ -371,122 +226,24 @@
   };
 
   const handleReset = () => {
-    tableQuery.queryParam.keyword = '';
+    tableQuery.queryParam.searchKey = '';
     tableQuery.queryParam.status = '';
     tableQuery.queryParam.venueCategory = '';
-    tableQuery.queryParam.planStartTime = '';
-    tableQuery.queryParam.planEndTime = '';
+    tableQuery.queryParam.startDate = '';
+    tableQuery.queryParam.endDate = '';
     dateRange.value = null;
     handleSearch();
   };
 
 
 
-  const handleEdit = (id: number) => {
-    router.push({
-      name: 'areaCheckPlanManagementItem',
-      query: { id, operate: 'area-check-plan-edit' },
-    });
-  };
-
   const handleView = (id: number) => {
     router.push({
-      name: 'areaCheckPlanManagementItem',
+      name: 'areaCheckPlanTaskItem',
       query: { id, operate: 'area-check-plan-view' },
     });
   };
 
-  const handleDelete = async (id: number) => {
-    try {
-      await deleteAreaCheckPlanManage(id);
-      ElMessage.success('删除成功');
-      getTableData();
-    } catch (e) {
-      console.error('删除失败:', e);
-    }
-  };
-
-  const handleIssue = (id: number) => {
-    currentIssuePlanId.value = id;
-    resetIssueForm();
-    showIssueDialog.value = true;
-  };
-
-  const handleIssueSave = async () => {
-    if (!issueFormRef.value || !currentIssuePlanId.value) return;
-    const valid = await issueFormRef.value.validate().catch(() => false);
-    if (!valid) return;
-    if (
-      issueForm.planStartTime &&
-      issueForm.planEndTime &&
-      new Date(issueForm.planStartTime) > new Date(issueForm.planEndTime)
-    ) {
-      ElMessage.error('计划开始日期不能大于计划结束日期');
-      return;
-    }
-    try {
-      // 仅提交：弹窗页面字段 + id（下拉同时提交 name + value）
-      const responsibleDeptIds = (issueForm.responsibleDeptIds ?? []).filter((v) => v != null);
-      const responsibleDeptNames = findDeptNamesByIds(issueDeptTree.value, responsibleDeptIds);
-      const responsibleDeptName = responsibleDeptNames.length ? responsibleDeptNames.join(',') : undefined;
-      const responsibleDeptCode = responsibleDeptIds.length ? responsibleDeptIds.join(',') : undefined;
-
-      const responsibleDeptPersonnelGroupName = (() => {
-        const code = issueForm.responsibleDeptPersonnelGroupCode;
-        if (code == null || code === '') return undefined;
-        const byId = userGroupOptions.value.find((g) => String(g.id) === code);
-        return byId?.name ?? undefined;
-      })();
-
-      const safetyEmergencyDeptName = findDeptNameById(issueDeptTree.value, issueForm.safetyEmergencyDeptId);
-      const hospitalLeaderDeptName = findDeptNameById(issueDeptTree.value, issueForm.hospitalLeaderDeptId);
-
-      const payload = {
-        id: currentIssuePlanId.value,
-        responsibleDeptName,
-        responsibleDeptCode,
-        responsibleDeptPersonnelGroupName,
-        responsibleDeptPersonnelGroupCode: issueForm.responsibleDeptPersonnelGroupCode,
-
-        // 安全应急部门
-        safetyEmergencyDeptName,
-        SafetyEmergencyDeptCode: issueForm.safetyEmergencyDeptId,
-        safetyEmergencyExecutorGroupName: findGroupNameById(issueForm.safetyEmergencyGroupId),
-        safetyEmergencyExecGroupCode:
-          issueForm.safetyEmergencyGroupId != null ? String(issueForm.safetyEmergencyGroupId) : undefined,
-
-        // 院领导部门
-        hospitalLeaderDeptName,
-        hospitalLeaderDeptCode: issueForm.hospitalLeaderDeptId,
-        hospitalLeaderExecutorGroupName: findGroupNameById(issueForm.hospitalLeaderGroupId),
-        hospitalLeaderExecGroupCode:
-          issueForm.hospitalLeaderGroupId != null ? String(issueForm.hospitalLeaderGroupId) : undefined,
-
-        // 计划时间与开关项
-        planStartTime: issueForm.planStartTime,
-        planEndTime: issueForm.planEndTime,
-        needOverallDesc: issueForm.needOverallDesc,
-        needSigneeSign: issueForm.needSigneeSign,
-      } as AreaCheckPlanRecord & { id: number } & Record<string, unknown>;
-
-      await sendAreaCheckPlanToDep(payload);
-      ElMessage.success('下发成功');
-      showIssueDialog.value = false;
-      getTableData();
-    } catch (e) {
-      ElMessage.error(e.message);
-    }
-  };
-
-  const handleCancel = async (id: number) => {
-    try {
-      await cancelAreaCheckPlanManage(id);
-      ElMessage.success('作废成功');
-      getTableData();
-    } catch (e) {
-      console.error('作废失败:', e);
-    }
-  };
 
 
 
@@ -494,12 +251,12 @@
     try {
       const response = await exportAreaCheckPlanAdministration(tableQuery.queryParam);
       if (response) {
-        const fileName = `区域检查计划管理_${new Date().toISOString().split('T')[0]}.xlsx`;
+        const fileName = `区域检查计划任务_${new Date().toISOString().split('T')[0]}.xlsx`;
         downloadByData(response, fileName);
         ElMessage.success('导出成功');
       }
     } catch (e) {
-      console.error('导出院级文件失败:', e);
+      console.error('导出文件失败:', e);
       ElMessage.error('导出失败，请重试');
     }
   };

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/areaCheckPlanTaskItem.vue

@@ -4,8 +4,8 @@
       <BreadcrumbBack />
       <span class="breadcrumb-title">{{ headerTitle }}</span>
     </header>
-    <AreaCheckPlanManagementDetail v-if="!isRecordDetail" />
-    <AreaCheckPlanRecordDetail v-else />
+
+    <AreaCheckPlanRecordDetail />
   </div>
 </template>
 
@@ -13,23 +13,20 @@
   import { computed } from 'vue';
   import { useRoute } from 'vue-router';
   import BreadcrumbBack from '@/components/BreadcrumbBack.vue';
-  import AreaCheckPlanManagementDetail from './components/areaCheckPlanManagementDetail.vue';
+
   import AreaCheckPlanRecordDetail from './components/areaCheckPlanRecordDetail.vue';
 
   const route = useRoute();
   const operate = computed(() => (route.query.operate as string) || '');
 
-  const isRecordDetail = computed(() => operate.value === 'area-check-plan-record-view');
-
   const headerTitle = computed(() => {
-    if (isRecordDetail.value) return '检查记录查看';
     switch (operate.value) {
       case 'area-check-plan-create':
-        return '新增区域检查计划';
+        return '开始任务检查';
       case 'area-check-plan-edit':
-        return '编辑区域检查计划';
+        return '编辑任务检查';
       case 'area-check-plan-view':
-        return '查看区域检查计划';
+        return '查看检查任务信息';
       default:
         return '未知操作';
     }

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/configs/tables.ts

@@ -19,7 +19,7 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '完成（检查）时间',
-    prop: 'venueCategoryName',
+    prop: 'checkTime',
     align: 'left',
     minWidth: '180px',
     showOverflowTooltip: true,
@@ -33,14 +33,21 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '检查人员',
-    prop: 'checkVenue',
+    prop: 'checkPerson',
     align: 'left',
     minWidth: '120px',
     showOverflowTooltip: true,
   },
+  {
+    label: '检查场所类别',
+    prop: 'checkPlaceCategory',
+    align: 'left',
+    minWidth: '160px',
+    showOverflowTooltip: true,
+  },
   {
     label: '检查场所',
-    prop: 'checkVenue',
+    prop: 'checkPlace',
     align: 'left',
     minWidth: '120px',
     showOverflowTooltip: true,
@@ -49,7 +56,7 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     label: '检查频次',
     prop: 'planName',
     align: 'left',
-    minWidth: '180px',
+    minWidth: '120px',
     showOverflowTooltip: true,
   },
   {
@@ -57,62 +64,50 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     prop: 'primaryResponsibleDeptName',
     slot: 'primaryResponsibleDeptName',
     align: 'left',
-    width: '140px',
+    width: '200px',
     showOverflowTooltip: true,
   },
   {
     label: '整体检查情况描述',
-    prop: 'primaryResponsibleDeptPersonName',
+    prop: 'overallCheckDesc',
     align: 'left',
-    minWidth: '160px',
+    minWidth: '200px',
     showOverflowTooltip: true,
   },
   {
     label: '被检查人签字',
-    prop: 'selfCheckFrequency',
+    prop: 'sign',
     align: 'left',
     minWidth: '140px',
     showOverflowTooltip: true,
   },
   {
     label: '检查项总数',
-    prop: 'categoryName',
+    prop: 'checkItemTotal',
     align: 'left',
-    minWidth: '180px',
+    minWidth: '160px',
     showOverflowTooltip: true,
   },
   {
     label: '合格项数',
-    prop: 'primaryResponsibleDeptExecGroupName',
+    prop: 'qualifiedItemNum',
     align: 'left',
-    minWidth: '240px',
+    minWidth: '160px',
     showOverflowTooltip: true,
   },
   {
     label: '不合格项数',
-    prop: 'checklistTemplateName',
+    prop: 'unqualifiedItemNum',
     align: 'left',
-    minWidth: '180px',
+    minWidth: '160px',
     showOverflowTooltip: true,
   },
-  {
-    label: '计划开始时间',
-    prop: 'planStartTime',
-    minWidth: '240px',
-    slot: 'planStartTime',
-  },
-  {
-    label: '计划结束时间',
-    prop: 'planEndTime',
-    minWidth: '240px',
-    slot: 'planEndTime',
-  },
   {
     label: '操作',
     prop: 'action',
     slot: 'action',
     fixed: 'right',
-    width: '250px',
+    width: '150px',
     align: 'left',
   },
 ];