|
|
@@ -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,
|
|
|
});
|
|
|
}
|
|
|
|