From 8d541eed8bb02d5a9b32b706cde9665df9a83aec Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 29 十月 2026 11:47:49 +0800
Subject: [PATCH] refactor(safety): 人员与车间字段改用员工选择器与车间下拉
---
src/api/safety/index.ts | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/api/safety/index.ts b/src/api/safety/index.ts
index 846e724..0684c3d 100644
--- a/src/api/safety/index.ts
+++ b/src/api/safety/index.ts
@@ -12,6 +12,8 @@
id?: number;
parentId?: number;
name: string;
+ /** 璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ leaderId?: number;
leaderName?: string;
leaderPhone?: string;
memberNames?: string;
@@ -57,11 +59,15 @@
name: string;
pointType: string;
pointTypeName?: string;
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛� */
+ workshopId?: number;
workshopName?: string;
location?: string;
inspectItems?: string;
inspectCycle?: string;
inspectCycleName?: string;
+ /** 璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ ownerId?: number;
ownerName?: string;
status: number;
lastInspectTime?: string;
@@ -77,7 +83,9 @@
pointType?: string;
pointTypeName?: string;
inspectTime: string;
- inspector: string;
+ /** 宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ inspectorId?: number;
+ inspector?: string;
result?: string;
resultName?: string;
content?: string;
@@ -102,8 +110,12 @@
location?: string;
description?: string;
photoUrls?: string;
- reporter: string;
+ /** 涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ reporterId?: number;
+ reporter?: string;
reportTime?: string;
+ /** 鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ assigneeId?: number;
assignee?: string;
assignTime?: string;
rectifyDeadline?: string;
@@ -111,6 +123,8 @@
rectifyDesc?: string;
rectifyPhotoUrls?: string;
rectifyTime?: string;
+ /** 澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ recheckerId?: number;
rechecker?: string;
recheckTime?: string;
recheckResult?: string;
@@ -130,10 +144,14 @@
permitType: string;
permitTypeName?: string;
title: string;
+ /** 浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop锛� */
+ workshopId?: number;
workshopName?: string;
location?: string;
workContent?: string;
- applicant: string;
+ /** 鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ applicantId?: number;
+ applicant?: string;
applyTime?: string;
planStartTime: string;
planEndTime: string;
@@ -142,9 +160,13 @@
riskLevel?: string;
riskLevelName?: string;
safetyMeasures?: string;
+ /** 瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ approverId?: number;
approver?: string;
approveTime?: string;
approveComment?: string;
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ guardianId?: number;
guardian?: string;
guardianRequired?: boolean;
status?: string;
@@ -159,7 +181,9 @@
id?: number;
permitId: number;
monitorTime?: string;
- guardian: string;
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ guardianId?: number;
+ guardian?: string;
monitorContent?: string;
abnormal?: string;
photoUrls?: string;
@@ -182,6 +206,8 @@
expireDate?: string;
expireRemainingDays?: number;
validityMonths?: number;
+ /** 淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ managerId?: number;
manager?: string;
status: number;
remark?: string;
@@ -215,6 +241,8 @@
trainingTypeName?: string;
trainDate: string;
durationHours?: number;
+ /** 璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ trainerId?: number;
trainer?: string;
location?: string;
participants?: string;
@@ -233,6 +261,8 @@
drillTypeName?: string;
drillDate: string;
location?: string;
+ /** 缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ organizerId?: number;
organizer?: string;
participants?: string;
participantCount?: number;
@@ -255,6 +285,8 @@
levelName?: string;
occurTime: string;
location?: string;
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛� */
+ workshopId?: number;
workshopName?: string;
casualtyDesc?: string;
economicLoss?: number;
@@ -262,6 +294,8 @@
description?: string;
causeAnalysis?: string;
measures?: string;
+ /** 鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛� */
+ reporterId?: number;
reporter?: string;
reportTime?: string;
status?: string;
@@ -389,7 +423,7 @@
export function deleteHazard(id: number) {
return requestClient.delete('/safety/hazard/delete', { params: { id } });
}
-export function assignHazard(data: { id: number; assignee: string; rectifyDeadline?: string; remark?: string }) {
+export function assignHazard(data: { id: number; assigneeId: number; rectifyDeadline?: string; remark?: string }) {
return requestClient.put('/safety/hazard/assign', data);
}
export function rectifyHazard(data: { id: number; rectifyDesc: string; rectifyPhotoUrls?: string }) {
@@ -397,7 +431,7 @@
}
export function recheckHazard(data: {
id: number;
- rechecker: string;
+ recheckerId: number;
recheckResult: string;
recheckRemark?: string;
}) {
@@ -422,7 +456,7 @@
}
export function approveWorkPermit(data: {
id: number;
- approver: string;
+ approverId: number;
decision: string;
approveComment?: string;
}) {
--
Gitblit v1.9.3