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/api/production-safety-system/index.ts

@@ -1526,12 +1526,11 @@ export function exportAreaCheckPlanList (params: AreaCheckPlanQuery) {
  * 导出区域检查计划清单
  * @returns Promise<any> 导出的区域检查计划清单数据
  */
-export function exportAreaCheckInspectionRecord (params: AreaCheckPlanQuery) {
+export function exportAreaCheckInspectionRecord (id:number) {
   return http.request({
-    url: '/areaCheckPlanManageDept/exportAreaCheckPlanDetail',
-    method: 'post',
+    url: '/areaCheckPlanManageDept/exportAreaCheckRecord?id=' + id,
+    method: 'get',
     responseType: 'blob',
-    data: params,
   }, {
     isTransformResponse: false,
   });

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

@@ -154,7 +154,7 @@
           <el-cascader
             ref="issueResponsibleDeptCascaderRef"
             v-model="issueForm.responsibleDeptIds"
-            :options="issueDeptTree"
+            :options="issueDeptTreeTow"
             :props="cascaderDeptPropMultiple"
             :show-all-levels="false"
             placeholder="请选择责任部门名称,支持多选"
@@ -354,6 +354,7 @@
   };
   // 下发弹窗：责任部门/安全应急部门/院领导部门复用新增区域检查计划的主责部门下拉（getAllDepartments）
   const issueDeptTree = ref<DeptTree[]>([]);
+  const issueDeptTreeTow = ref<DeptTree[]>([]);
   const cascaderDeptProp = {
     checkStrictly: true,
     expandTrigger: 'hover' as const,
@@ -373,6 +374,10 @@
     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 = [];

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

@@ -18,24 +18,17 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     width: '80px',
   },
   {
-    label: '检查场所',
-    prop: 'checkVenue',
+    label: '检查场所所属类别',
+    prop: 'venueCategoryName',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
-    label: '状态',
-    prop: 'status',
-    slot: 'status',
-    align: 'center',
-    minWidth: '120px',
-  },
-  {
-    label: '检查场所所属类别',
-    prop: 'venueCategoryName',
+    label: '检查场所',
+    prop: 'checkVenue',
     align: 'left',
-    minWidth: '180px',
+    minWidth: '120px',
     showOverflowTooltip: true,
   },
   {
@@ -52,20 +45,6 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     minWidth: '140px',
     showOverflowTooltip: true,
   },
-  {
-    label: '自查频次',
-    prop: 'selfCheckFrequency',
-    align: 'left',
-    minWidth: '140px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '主责部门执行人所属分组名称',
-    prop: 'primaryResponsibleDeptExecGroupName',
-    align: 'left',
-    minWidth: '240px',
-    showOverflowTooltip: true,
-  },
   {
     label: '主责部门责任人',
     prop: 'primaryResponsibleDeptPersonName',
@@ -74,68 +53,12 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     showOverflowTooltip: true,
   },
   {
-    label: '安全应急部门名称',
-    prop: 'safetyEmergencyDeptName',
-    align: 'left',
-    minWidth: '180px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '安全应急部检查频次',
-    prop: 'safetyEmergencyCheckFrequency',
-    align: 'left',
-    minWidth: '180px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '安全应急部执行人所属分组名称',
-    prop: 'safetyEmergencyExecutorGroupName',
-    align: 'left',
-    minWidth: '260px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '安全应急部责任人',
-    prop: 'safetyEmergencyResponsiblePerson',
-    align: 'left',
-    minWidth: '180px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '院领导部门名称',
-    prop: 'hospitalLeaderDeptName',
-    align: 'left',
-    minWidth: '180px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '院领导检查频次',
-    prop: 'hospitalLeaderCheckFrequency',
-    align: 'left',
-    minWidth: '160px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '院领导执行人所属分组名称',
-    prop: 'hospitalLeaderExecutorGroupName',
-    align: 'left',
-    minWidth: '220px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '院领导责任人',
-    prop: 'hospitalLeaderResponsiblePerson',
+    label: '自查频次',
+    prop: 'selfCheckFrequency',
     align: 'left',
     minWidth: '140px',
     showOverflowTooltip: true,
   },
-  {
-    label: '检查重点内容',
-    prop: 'checkKeyContent',
-    align: 'left',
-    minWidth: '150px',
-    showOverflowTooltip: true,
-  },
   {
     label: '检查单所属类别名称',
     prop: 'categoryName',
@@ -144,25 +67,18 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     showOverflowTooltip: true,
   },
   {
-    label: '检查单模版名称',
-    prop: 'checklistTemplateName',
+    label: '主责部门执行人所属分组名称',
+    prop: 'primaryResponsibleDeptExecGroupName',
     align: 'left',
-    minWidth: '160px',
-    showOverflowTooltip: true,
-  },
-  {
-    label: '是否需要整体检查情况描述',
-    prop: 'needOverallDesc',
-    slot: 'needOverallDesc',
-    align: 'center',
     minWidth: '240px',
+    showOverflowTooltip: true,
   },
   {
-    label: '是否需要被检查人签字',
-    prop: 'needSigneeSign',
-    slot: 'needSigneeSign',
-    align: 'center',
-    minWidth: '200px',
+    label: '检查单模板',
+    prop: 'checklistTemplateName',
+    align: 'left',
+    minWidth: '180px',
+    showOverflowTooltip: true,
   },
   {
     label: '计划开始时间',
@@ -176,6 +92,97 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     minWidth: '240px',
     slot: 'planEndTime',
   },
+  // {
+  //   label: '状态',
+  //   prop: 'status',
+  //   slot: 'status',
+  //   align: 'center',
+  //   minWidth: '120px',
+  // },
+  // {
+  //   label: '安全应急部门名称',
+  //   prop: 'safetyEmergencyDeptName',
+  //   align: 'left',
+  //   minWidth: '180px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '安全应急部检查频次',
+  //   prop: 'safetyEmergencyCheckFrequency',
+  //   align: 'left',
+  //   minWidth: '180px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '安全应急部执行人所属分组名称',
+  //   prop: 'safetyEmergencyExecutorGroupName',
+  //   align: 'left',
+  //   minWidth: '260px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '安全应急部责任人',
+  //   prop: 'safetyEmergencyResponsiblePerson',
+  //   align: 'left',
+  //   minWidth: '180px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '院领导部门名称',
+  //   prop: 'hospitalLeaderDeptName',
+  //   align: 'left',
+  //   minWidth: '180px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '院领导检查频次',
+  //   prop: 'hospitalLeaderCheckFrequency',
+  //   align: 'left',
+  //   minWidth: '160px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '院领导执行人所属分组名称',
+  //   prop: 'hospitalLeaderExecutorGroupName',
+  //   align: 'left',
+  //   minWidth: '220px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '院领导责任人',
+  //   prop: 'hospitalLeaderResponsiblePerson',
+  //   align: 'left',
+  //   minWidth: '140px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '检查重点内容',
+  //   prop: 'checkKeyContent',
+  //   align: 'left',
+  //   minWidth: '150px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '检查单模版名称',
+  //   prop: 'checklistTemplateName',
+  //   align: 'left',
+  //   minWidth: '160px',
+  //   showOverflowTooltip: true,
+  // },
+  // {
+  //   label: '是否需要整体检查情况描述',
+  //   prop: 'needOverallDesc',
+  //   slot: 'needOverallDesc',
+  //   align: 'center',
+  //   minWidth: '240px',
+  // },
+  // {
+  //   label: '是否需要被检查人签字',
+  //   prop: 'needSigneeSign',
+  //   slot: 'needSigneeSign',
+  //   align: 'center',
+  //   minWidth: '200px',
+  // },
   {
     label: '操作',
     prop: 'action',

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanManagementDeptDetail.vue

@@ -674,15 +674,7 @@
   };
   const onRecordExport = async () => {
     try {
-      const [start, end] = recordDateRange.value && recordDateRange.value.length === 2
-        ? recordDateRange.value
-        : ['', ''];
-      const queryParam = {
-          searchKey: recordSearchKeyword.value || undefined,
-          startDate: start || undefined,
-          endDate: end || undefined,
-      };
-      const response = await exportAreaCheckInspectionRecord(queryParam);
+      const response = await exportAreaCheckInspectionRecord(currentId.value);
       if (response) {
         const fileName = `检查记录_${new Date().toISOString().split('T')[0]}.xlsx`;
         downloadByData(response, fileName);