xiaweibo пре 3 месеци
родитељ
комит
5b020e1735

+ 44 - 43
src/api/production-safety-system/index.ts

@@ -776,20 +776,15 @@ interface AreaCheckPlanManageApiRecord {
   checkPlaceCategory?: string; // 检查场所所属类别
   checkCategory?: string; // 检查类别
   status?: number | string; // 状态:0=未开始 1=进行中 2=已完成 3=已终止
-  /** 新增/编辑、列表/详情:主责部门 */
-  primary_responsible_dept_name?: string;
-  primary_responsible_dept_code?: string;
-  responsibleDeptName?: string; // 主责部门名称(兼容)
-  responsibleDeptCode?: string; // 主责部门code(兼容)
+  /** save/update 请求体使用:主责部门名称 */
+  primaryResponsibleDeptName?: string;
+  /** save/update 请求体使用:主责部门 code */
+  primaryResponsibleDeptCode?: string;
+  responsibleDeptName?: string; // 主责部门名称(兼容后端返回)
+  responsibleDeptCode?: string; // 主责部门code(兼容后端返回)
   selfCheckFrequency?: number | string; // 自查频次:0=每日 1=每周 2=每月 3=每季度 4=每半年 5=每年
   responsibleDeptExecGroupName?: string; // 主责部门执行人所属分组名称
   responsibleDeptExecGroupCode?: string; // 主责部门执行人所属分组code
-  /** 下发任务:责任部门 */
-  responsible_dept_name?: string;
-  responsible_dept_code?: string;
-  /** 下发任务:责任部门人员分组 */
-  responsible_dept_personnel_group_name?: string;
-  responsible_dept_personnel_group_code?: string;
   responsibleDeptPersonName?: string; // 主责部门责任人名称
   responsibleDeptPersonCode?: string; // 主责部门责任人code
   safetyEmergencyDeptName?: string; // 安全应急部门名称
@@ -837,21 +832,13 @@ export interface AreaCheckPlanRecord {
   status?: AreaCheckPlanStatus;
   venueCategoryName?: string;
   planName?: string;
-  /** 新增/编辑、列表/详情:主责部门 */
-  primary_responsible_dept_name?: string;
-  primary_responsible_dept_code?: string;
-  mainDeptName?: string;
-  mainDeptCode?: string;
+  primaryResponsibleDeptName?: string;
+  primaryResponsibleDeptCode?: string;
   selfCheckFrequency?: string;
   mainDeptExecutorGroupName?: string;
   mainDeptExecGroupCode?: string;
   mainDeptResponsiblePerson?: string;
   mainDeptResponsiblePersonCode?: string;
-  /** 下发任务:责任部门、责任部门人员分组 */
-  responsible_dept_name?: string;
-  responsible_dept_code?: string;
-  responsible_dept_personnel_group_name?: string;
-  responsible_dept_personnel_group_code?: string;
   safetyEmergencyDeptName?: string;
   safetyEmergencyDeptCode?: string;
   safetyEmergencyCheckFrequency?: string;
@@ -895,10 +882,8 @@ export function mapAreaCheckPlanApiRecordToUi(api: AreaCheckPlanManageApiRecord
     checkVenue: api.checkPlace,
     venueCategoryName: api.checkPlaceCategory ?? api.checkCategory,
     status: api.status as AreaCheckPlanStatus | undefined,
-    primary_responsible_dept_name: api.primary_responsible_dept_name ?? api.responsibleDeptName ?? api.responsibleDept,
-    primary_responsible_dept_code: api.primary_responsible_dept_code ?? api.responsibleDeptCode,
-    mainDeptName: api.responsibleDeptName ?? api.responsibleDept,
-    mainDeptCode: api.responsibleDeptCode,
+    primaryResponsibleDeptName: api.primaryResponsibleDeptName ?? api.responsibleDeptName ?? api.responsibleDept,
+    primaryResponsibleDeptCode: api.primaryResponsibleDeptCode ?? api.responsibleDeptCode,
     selfCheckFrequency: toFreq(api.selfCheckFrequency),
     mainDeptExecutorGroupName: api.responsibleDeptExecGroupName ?? api.responsibleDeptExecGroup,
     mainDeptExecGroupCode: api.responsibleDeptExecGroupCode,
@@ -936,28 +921,18 @@ function uiRecordToApi(ui: AreaCheckPlanRecord & { id?: number }): AreaCheckPlan
   const toFreqNum = (v: string | undefined) => (v ? LABEL_TO_FREQUENCY[v] ?? undefined : undefined);
   const toNum = (v: boolean | undefined) => (v === true ? 1 : v === false ? 0 : undefined);
   const code = (ui as Record<string, unknown>);
+  const primaryResponsibleDeptCode = (code.primaryResponsibleDeptCode as string | undefined)
+    ?? (code.primaryResponsibleDeptId != null ? String(code.primaryResponsibleDeptId) : undefined);
   return {
     id: ui.id,
     areaCheckPlanName: ui.planName,
     checkPlace: ui.checkVenue,
     checkPlaceCategory: ui.venueCategoryName,
-    primary_responsible_dept_name: ui.primary_responsible_dept_name ?? ui.mainDeptName,
-    primary_responsible_dept_code: (code.primary_responsible_dept_code as string | undefined)
-      ?? (code.mainDeptCode as string | undefined)
-      ?? (code.primary_responsible_dept_id != null ? String(code.primary_responsible_dept_id) : undefined)
-      ?? (code.mainDeptId != null ? String(code.mainDeptId) : undefined),
-    responsibleDeptName: ui.responsible_dept_name ?? ui.primary_responsible_dept_name ?? ui.mainDeptName,
-    responsibleDeptCode: (code.responsible_dept_code as string | undefined)
-      ?? (code.primary_responsible_dept_code as string | undefined)
-      ?? (code.mainDeptCode as string | undefined)
-      ?? (code.mainDeptId != null ? String(code.mainDeptId) : undefined),
-    responsible_dept_name: ui.responsible_dept_name,
-    responsible_dept_code: code.responsible_dept_code as string | undefined,
-    responsible_dept_personnel_group_name: ui.responsible_dept_personnel_group_name,
-    responsible_dept_personnel_group_code: code.responsible_dept_personnel_group_code as string | undefined,
+    primaryResponsibleDeptName: ui.primaryResponsibleDeptName,
+    primaryResponsibleDeptCode,
     selfCheckFrequency: toFreqNum(ui.selfCheckFrequency),
-    responsibleDeptExecGroupName: ui.responsible_dept_personnel_group_name ?? ui.mainDeptExecutorGroupName,
-    responsibleDeptExecGroupCode: (code.responsible_dept_personnel_group_code as string | undefined) ?? (code.mainDeptExecGroupCode as string | undefined),
+    responsibleDeptExecGroupName: ui.mainDeptExecutorGroupName,
+    responsibleDeptExecGroupCode: code.mainDeptExecGroupCode as string | undefined,
     responsibleDeptPersonName: ui.mainDeptResponsiblePerson,
     responsibleDeptPersonCode: code.mainDeptResponsiblePersonCode as string | undefined,
     safetyEmergencyDeptName: ui.safetyEmergencyDeptName,
@@ -1138,12 +1113,38 @@ export function queryAreaCheckPlanManageDeptDetail(id: number) {
   });
 }
 
+/** 下发区域检查计划至部门(sandAreaCheckPlanToDep)请求体:责任部门、责任部门人员分组使用指定字段名 */
+export interface SendAreaCheckPlanToDepReq {
+  id: number;
+  /** 责任部门名称(多选逗号拼接) */
+  responsibleDeptName?: string;
+  /** 责任部门 code(多选逗号拼接) */
+  responsibleDeptCode?: string;
+  /** 责任部门人员分组名称 */
+  responsibleDeptPersonnelGroupName?: string;
+  /** 责任部门人员分组 code */
+  responsibleDeptPersonnelGroupCode?: string;
+  safetyEmergencyDeptName?: string;
+  safetyEmergencyDeptId?: number;
+  safetyEmergencyExecutorGroupName?: string;
+  safetyEmergencyExecGroupCode?: string;
+  hospitalLeaderDeptName?: string;
+  hospitalLeaderDeptId?: number;
+  hospitalLeaderExecutorGroupName?: string;
+  hospitalLeaderExecGroupCode?: string;
+  planStartTime?: string;
+  planEndTime?: string;
+  needOverallDesc?: boolean;
+  needInspectedSign?: boolean;
+  [key: string]: unknown;
+}
+
 /** 下发区域检查计划至部门(管理员) */
-export function sendAreaCheckPlanToDep(data: AreaCheckPlanRecord & { id: number }) {
+export function sendAreaCheckPlanToDep(data: SendAreaCheckPlanToDepReq) {
   return http.request({
     url: `areaCheckPlanManageAdmin/sandAreaCheckPlanToDep`,
     method: 'post',
-    data: uiRecordToApi(data),
+    data,
   });
 }
 

+ 22 - 19
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/areaCheckPlanManagement.vue

@@ -158,9 +158,9 @@
             style="width: 100%"
           />
         </el-form-item>
-        <el-form-item label="责任部门人员分组:" prop="responsible_dept_personnel_group_code">
+        <el-form-item label="责任部门人员分组:" prop="responsibleDeptPersonnelGroupCode">
           <el-select
-            v-model="issueForm.responsible_dept_personnel_group_code"
+            v-model="issueForm.responsibleDeptPersonnelGroupCode"
             placeholder="请选择责任部门执行人所在分组名称,单选"
             filterable
             clearable
@@ -313,7 +313,7 @@
   const issueResponsibleDeptCascaderRef = ref();
   const issueForm = reactive({
     responsibleDeptIds: [] as number[],
-    responsible_dept_personnel_group_code: undefined as string | undefined,
+    responsibleDeptPersonnelGroupCode: undefined as string | undefined,
     safetyEmergencyDeptId: undefined as number | undefined,
     safetyEmergencyGroupId: undefined as number | undefined,
     hospitalLeaderDeptId: undefined as number | undefined,
@@ -325,7 +325,7 @@
   });
   const issueRules = {
     responsibleDeptIds: [{ required: true, message: '请选择责任部门', trigger: 'change', type: 'array', min: 1 }],
-    responsible_dept_personnel_group_code: [{ required: true, message: '请选择责任部门人员分组', trigger: 'change' }],
+    responsibleDeptPersonnelGroupCode: [{ required: true, message: '请选择责任部门人员分组', trigger: 'change' }],
     safetyEmergencyDeptId: [{ required: true, message: '请选择安全应急部门', trigger: 'change' }],
     safetyEmergencyGroupId: [{ required: true, message: '请选择安全应急部人员分组', trigger: 'change' }],
     hospitalLeaderDeptId: [{ required: true, message: '请选择院领导部门', trigger: 'change' }],
@@ -400,16 +400,14 @@
       .filter((name): name is string => !!name && String(name).trim().length > 0);
   };
 
-  const findGroupNameById = (id: number | string | undefined): string | undefined => {
-    if (id == null || id === '') return undefined;
-    const numId = typeof id === 'string' ? parseInt(id, 10) : id;
-    if (Number.isNaN(numId)) return undefined;
-    return userGroupOptions.value.find((g) => g.id === numId)?.name;
+  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.responsible_dept_personnel_group_code = undefined;
+    issueForm.responsibleDeptPersonnelGroupCode = undefined;
     issueForm.safetyEmergencyDeptId = undefined;
     issueForm.safetyEmergencyGroupId = undefined;
     issueForm.hospitalLeaderDeptId = undefined;
@@ -535,23 +533,28 @@
       return;
     }
     try {
-      // 仅提交:弹窗页面字段 + id(责任部门/责任部门人员分组使用新字段名
+      // 仅提交:弹窗页面字段 + id(下拉同时提交 name + value
       const responsibleDeptIds = (issueForm.responsibleDeptIds ?? []).filter((v) => v != null);
       const responsibleDeptNames = findDeptNamesByIds(issueDeptTree.value, responsibleDeptIds);
-      const responsible_dept_name = responsibleDeptNames.length ? responsibleDeptNames.join(',') : undefined;
-      const responsible_dept_code = responsibleDeptIds.length ? responsibleDeptIds.join(',') : undefined;
+      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,
-        // 下发任务:责任部门
-        responsible_dept_name,
-        responsible_dept_code,
-        // 下发任务:责任部门人员分组
-        responsible_dept_personnel_group_name: findGroupNameById(issueForm.responsible_dept_personnel_group_code),
-        responsible_dept_personnel_group_code: issueForm.responsible_dept_personnel_group_code ?? undefined,
+        responsibleDeptName,
+        responsibleDeptCode,
+        responsibleDeptPersonnelGroupName,
+        responsibleDeptPersonnelGroupCode: issueForm.responsibleDeptPersonnelGroupCode,
 
         // 安全应急部门
         safetyEmergencyDeptName,

+ 16 - 28
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/components/areaCheckPlanManagementDetail.vue

@@ -29,7 +29,7 @@
         <div class="row">
           <div class="col">
             <div class="label">主责部门:</div>
-            <div class="value">{{ viewDetail.primary_responsible_dept_name || viewDetail.mainDeptName || '-' }}</div>
+            <div class="value">{{ viewDetail.primaryResponsibleDeptName || '-' }}</div>
           </div>
           <div class="col">
             <div class="label">自查频率:</div>
@@ -217,10 +217,10 @@
       :formRules="isViewMode ? undefined : formRules"
       :formConfig="computedFormConfig"
     >
-      <template #mainDept>
+      <template #primaryResponsibleDept>
         <el-cascader
-          ref="mainDeptCascaderRef"
-          v-model="ruleFormData.primary_responsible_dept_id"
+          ref="primaryResponsibleDeptCascaderRef"
+          v-model="ruleFormData.primaryResponsibleDeptId"
           :options="deptTree"
           :props="cascaderDeptProp"
           :show-all-levels="false"
@@ -229,7 +229,7 @@
           clearable
           :disabled="isViewMode"
           style="width: 100%"
-          @change="onMainDeptChange"
+          @change="onPrimaryResponsibleDeptChange"
         />
       </template>
       <template #safetyEmergencyDept>
@@ -479,7 +479,7 @@
   );
 
   // 部门树,与新增物品领取记录页的部门下拉一致(getAllDepartments,取第一级 children)
-  const mainDeptCascaderRef = ref();
+  const primaryResponsibleDeptCascaderRef = ref();
   const safetyEmergencyDeptCascaderRef = ref();
   const hospitalLeaderDeptCascaderRef = ref();
   const deptTree = ref<DeptTree[]>([]);
@@ -512,20 +512,18 @@
     return undefined;
   };
 
-  const setDeptNameFromCascader = (refVal: any, nameKey: 'primary_responsible_dept_name' | 'safetyEmergencyDeptName' | 'hospitalLeaderDeptName') => {
+  const setDeptNameFromCascader = (refVal: any, nameKey: 'primaryResponsibleDeptName' | 'safetyEmergencyDeptName' | 'hospitalLeaderDeptName') => {
     const nodes = refVal?.getCheckedNodes?.();
     const label = nodes?.[0]?.label ?? '';
     const value = nodes?.[0]?.value;
-    if (nameKey === 'primary_responsible_dept_name') {
-      ruleFormData.primary_responsible_dept_name = label;
-      (ruleFormData as Record<string, unknown>).primary_responsible_dept_code = value != null ? String(value) : '';
-    } else {
-      (ruleFormData as Record<string, unknown>)[nameKey] = label;
+    ruleFormData[nameKey] = label;
+    if (nameKey === 'primaryResponsibleDeptName') {
+      ruleFormData.primaryResponsibleDeptCode = value != null ? String(value) : '';
     }
   };
 
-  const onMainDeptChange = () => {
-    setDeptNameFromCascader(mainDeptCascaderRef.value, 'primary_responsible_dept_name');
+  const onPrimaryResponsibleDeptChange = () => {
+    setDeptNameFromCascader(primaryResponsibleDeptCascaderRef.value, 'primaryResponsibleDeptName');
   };
   const onSafetyEmergencyDeptChange = () => {
     setDeptNameFromCascader(safetyEmergencyDeptCascaderRef.value, 'safetyEmergencyDeptName');
@@ -637,8 +635,7 @@
       planName: d?.planName ?? ruleFormData.planName ?? '-',
       venueCategoryName: d?.venueCategoryName ?? ruleFormData.venueCategoryName ?? '-',
       checkVenue: d?.checkVenue ?? ruleFormData.checkVenue ?? '-',
-      primary_responsible_dept_name: d?.primary_responsible_dept_name ?? d?.mainDeptName ?? (ruleFormData as Record<string, unknown>).primary_responsible_dept_name ?? ruleFormData.mainDeptName ?? '-',
-      mainDeptName: d?.mainDeptName ?? ruleFormData.mainDeptName ?? '-',
+      primaryResponsibleDeptName: d?.primaryResponsibleDeptName ?? ruleFormData.primaryResponsibleDeptName ?? '-',
       selfCheckFrequency: d?.selfCheckFrequency ?? ruleFormData.selfCheckFrequency ?? '-',
       mainDeptExecutorGroupName: d?.mainDeptExecutorGroupName ?? '-',
       mainDeptResponsiblePerson: d?.mainDeptResponsiblePerson ?? '-',
@@ -930,12 +927,6 @@
         operate: 'area-check-plan-record-view',
         recordId: row.id,
         planId: currentId.value,
-        inspectedUnit: String(row.checkedCompanyName ?? row.checkedCompany ?? viewDetail.value.primary_responsible_dept_name ?? viewDetail.value.mainDeptName ?? viewDetail.value.checkVenue ?? ''),
-        inspector: String(row.checkPersonName ?? row.checkPerson ?? row.inspector ?? ''),
-        checkTime: String(row.checkTime ?? row.inspectionTime ?? ''),
-        checkPlace: String(row.checkAddress ?? row.checkPlace ?? row.venue ?? ''),
-        overallDesc: String(row.overallCheckDesc ?? row.overallDesc ?? ''),
-        signFile: String(row.checkedPersonSign ?? row.signFile ?? ''),
       },
     });
   };
@@ -955,12 +946,9 @@
       ruleFormData.planName = detail.planName ?? '';
       ruleFormData.venueCategoryName = detail.venueCategoryName ?? '';
       ruleFormData.checkVenue = detail.checkVenue ?? '';
-      const mainDeptName = detail.primary_responsible_dept_name ?? detail.mainDeptName ?? '';
-      (ruleFormData as Record<string, unknown>).primary_responsible_dept_name = mainDeptName;
-      (ruleFormData as Record<string, unknown>).primary_responsible_dept_code = detail.primary_responsible_dept_code ?? detail.mainDeptCode ?? '';
-      const primaryCode = detail.primary_responsible_dept_code ?? detail.mainDeptCode;
-      const idFromCode = primaryCode != null && /^\d+$/.test(String(primaryCode)) ? Number(primaryCode) : undefined;
-      (ruleFormData as Record<string, unknown>).primary_responsible_dept_id = idFromCode ?? findDeptIdByName(deptTree.value, mainDeptName) ?? null;
+      ruleFormData.primaryResponsibleDeptName = detail.primaryResponsibleDeptName ?? '';
+      ruleFormData.primaryResponsibleDeptCode = detail.primaryResponsibleDeptCode ?? '';
+      ruleFormData.primaryResponsibleDeptId = findDeptIdByName(deptTree.value, ruleFormData.primaryResponsibleDeptName as string) ?? null;
       ruleFormData.selfCheckFrequency = detail.selfCheckFrequency ?? '';
       ruleFormData.safetyEmergencyDeptName = detail.safetyEmergencyDeptName ?? '';
       ruleFormData.safetyEmergencyDeptId = findDeptIdByName(deptTree.value, ruleFormData.safetyEmergencyDeptName as string) ?? null;

+ 6 - 6
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/components/areaCheckPlanRecordDetail.vue

@@ -119,12 +119,12 @@
       const raw = (res as { data?: Record<string, unknown> })?.data ?? res;
       const r = raw as Record<string, unknown>;
       formData.value = {
-        inspectedUnit: String(r?.checkedCompanyName ?? r?.checkedCompany ?? route.query.inspectedUnit ?? ''),
-        inspector: String(r?.checkPersonName ?? r?.checkPerson ?? route.query.inspector ?? ''),
-        checkTime: String(r?.checkTime ?? route.query.checkTime ?? ''),
-        checkPlace: String(r?.checkAddress ?? r?.checkPlace ?? route.query.checkPlace ?? ''),
-        overallDesc: String(r?.overallCheckDesc ?? route.query.overallDesc ?? ''),
-        signFile: String(r?.checkedPersonSign ?? route.query.signFile ?? ''),
+        inspectedUnit: String(r?.checkedCompanyName ?? r?.checkedCompany ?? ''),
+        inspector: String(r?.checkPersonName ?? r?.checkPerson ?? ''),
+        checkTime: String(r?.checkTime ?? ''),
+        checkPlace: String(r?.checkAddress ?? r?.checkPlace ?? ''),
+        overallDesc: String(r?.overallCheckDesc ?? ''),
+        signFile: String(r?.checkedPersonSign ?? ''),
       };
       const records = (r?.areaCheckRecords ?? []) as Array<Record<string, unknown>>;
       checkItems.value = records.map((r) => ({

+ 6 - 6
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/configs/form.ts

@@ -44,9 +44,9 @@ export const AREA_CHECK_PLAN_FORM_CONFIG: FormConfig[] = [
     },
   },
   {
-    prop: 'primary_responsible_dept_name',
+    prop: 'primaryResponsibleDeptName',
     label: '主责部门:',
-    slot: 'mainDept', // 与新增物品领取记录页的部门下拉一致(el-cascader + getAllDepartments)
+    slot: 'primaryResponsibleDept', // 与新增物品领取记录页的部门下拉一致(el-cascader + getAllDepartments)
     componentProps: {
       placeholder: '请选择部门',
     },
@@ -124,9 +124,9 @@ export const AREA_CHECK_PLAN_FORM_DATA: Record<string, unknown> = {
   planName: '',
   venueCategoryName: '',
   checkVenue: '',
-  primary_responsible_dept_id: null as number | null,
-  primary_responsible_dept_name: '',
-  primary_responsible_dept_code: '',
+  primaryResponsibleDeptId: null as number | null,
+  primaryResponsibleDeptName: '',
+  primaryResponsibleDeptCode: '',
   selfCheckFrequency: '',
   safetyEmergencyDeptId: null as number | null,
   safetyEmergencyDeptName: '',
@@ -144,7 +144,7 @@ export const AREA_CHECK_PLAN_FORM_RULES = {
   planName: [{ required: true, message: '请输入区域检查计划名称', trigger: 'blur' }],
   venueCategoryName: [{ required: true, message: '请输入检查类别', trigger: 'blur' }],
   checkVenue: [{ required: true, message: '请输入检查场所', trigger: 'blur' }],
-  primary_responsible_dept_name: [{ required: true, message: '请选择主责部门', trigger: 'change' }],
+  primaryResponsibleDeptName: [{ required: true, message: '请选择主责部门', trigger: 'change' }],
   selfCheckFrequency: [{ required: true, message: '请选择自查频次', trigger: 'change' }],
   safetyEmergencyDeptName: [{ required: true, message: '请选择安全应急部门', trigger: 'change' }],
   hospitalLeaderDeptName: [{ required: true, message: '请选择院领导部门', trigger: 'change' }],

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

@@ -47,7 +47,7 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '主责部门',
-    prop: 'primary_responsible_dept_name',
+    prop: 'primaryResponsibleDeptName',
     align: 'left',
     minWidth: '120px',
     showOverflowTooltip: true,

+ 2 - 10
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/configs/types.ts

@@ -7,17 +7,9 @@ export interface AreaCheckPlanRecord {
   status?: AreaCheckPlanStatus;
   venueCategoryName?: string;
   planName?: string;
-  /** 新增/编辑、列表/详情:主责部门 */
-  primary_responsible_dept_name?: string;
-  primary_responsible_dept_code?: string;
-  mainDeptName?: string;
-  mainDeptCode?: string;
+  primaryResponsibleDeptName?: string;
+  primaryResponsibleDeptCode?: string;
   selfCheckFrequency?: string;
-  /** 下发任务:责任部门、责任部门人员分组 */
-  responsible_dept_name?: string;
-  responsible_dept_code?: string;
-  responsible_dept_personnel_group_name?: string;
-  responsible_dept_personnel_group_code?: string;
   mainDeptExecutorGroupName?: string;
   mainDeptExecGroupCode?: string;
   mainDeptResponsiblePerson?: string;

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

@@ -705,12 +705,6 @@
         operate: 'area-check-plan-record-view',
         recordId: row.id,
         planId: currentId.value,
-        inspectedUnit: String(row.checkedCompanyName ?? row.checkedCompany ?? viewDetail.value.mainDeptName ?? viewDetail.value.checkVenue ?? ''),
-        inspector: String(row.checkPersonName ?? row.checkPerson ?? row.inspector ?? ''),
-        checkTime: String(row.checkTime ?? row.inspectionTime ?? ''),
-        checkPlace: String(row.checkAddress ?? row.checkPlace ?? row.venue ?? ''),
-        overallDesc: String(row.overallCheckDesc ?? row.overallDesc ?? ''),
-        signFile: String(row.checkedPersonSign ?? row.signFile ?? ''),
       },
     });
   };

+ 13 - 13
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanRecordDetailDept.vue

@@ -200,12 +200,12 @@
         const raw = (res as { data?: Record<string, unknown> })?.data ?? res;
         const r = raw as Record<string, unknown>;
         formData.value = {
-          inspectedUnit: String(r?.checkedCompanyName ?? r?.checkedCompany ?? route.query.inspectedUnit ?? ''),
-          inspector: String(r?.checkPersonName ?? r?.checkPerson ?? route.query.inspector ?? ''),
-          checkTime: String(r?.checkTime ?? route.query.checkTime ?? ''),
-          checkPlace: String(r?.checkAddress ?? r?.checkPlace ?? route.query.checkPlace ?? ''),
-          overallDesc: String(r?.overallCheckDesc ?? route.query.overallDesc ?? ''),
-          signFile: String(r?.checkedPersonSign ?? route.query.signFile ?? ''),
+          inspectedUnit: String(r?.checkedCompanyName ?? r?.checkedCompany ?? ''),
+          inspector: String(r?.checkPersonName ?? r?.checkPerson ?? ''),
+          checkTime: String(r?.checkTime ?? ''),
+          checkPlace: String(r?.checkAddress ?? r?.checkPlace ?? ''),
+          overallDesc: String(r?.overallCheckDesc ?? ''),
+          signFile: String(r?.checkedPersonSign ?? ''),
         };
         const records = (r?.areaCheckRecords ?? []) as Array<Record<string, unknown>>;
         checkItems.value = records.map((item) => ({
@@ -218,14 +218,14 @@
         console.error('获取检查记录详情失败:', e);
       }
     } else {
-      // 无 recordId 的查看场景,不再使用任何假数据,只保留空表单和空检查明细
+      // 无 recordId 的查看场景,只保留空表单和空检查明细(不依赖路由传递数据)
       formData.value = {
-        inspectedUnit: String(route.query.inspectedUnit || ''),
-        inspector: String(route.query.inspector || ''),
-        checkTime: String(route.query.checkTime || ''),
-        checkPlace: String(route.query.checkPlace || ''),
-        overallDesc: String(route.query.overallDesc || ''),
-        signFile: String(route.query.signFile || ''),
+        inspectedUnit: '',
+        inspector: '',
+        checkTime: '',
+        checkPlace: '',
+        overallDesc: '',
+        signFile: '',
       };
       checkItems.value = [];
     }