From 1deae1d89a7039ef0b943be291f6c1b9aaa5ad2c Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 10:30:33 +0800
Subject: [PATCH] feat(mes): 生产报工新增「可报工数量」展示 - `src/api/mes/pro/task/index.ts`: `MesProTaskApi.Task` 接口新增 `reportableQuantity` (可报工数量) 字段定义 - `src/views/mes/pro/feedback/data.ts`: - 生产报工弹框表单中新增「可报工数量」字段展示，设置为不可编辑，且仅在新建/编辑模式下显示 - 在生产任务选择弹框 (`ProTaskSelect`) 的 `onChange` 事件中，自动从选中的任务对象中提取并带入 `reportableQuantity` - 完善了表单联动的重置逻辑，确保更换工单等操作时正确清空此字段
---
src/api/hrm/employee/index.ts | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/api/hrm/employee/index.ts b/src/api/hrm/employee/index.ts
index d5deea4..0287f85 100644
--- a/src/api/hrm/employee/index.ts
+++ b/src/api/hrm/employee/index.ts
@@ -18,6 +18,11 @@
phone?: string;
email?: string;
idCard?: string;
+ nation?: string;
+ marriageStatus?: string;
+ age?: number;
+ education?: string;
+ politicalStatus?: string;
hireDate?: string;
regularDate?: string;
leaveDate?: string;
@@ -82,6 +87,16 @@
deptName?: string;
postName?: string;
}
+
+ /** 鍛樺伐瀵煎叆缁撴灉 */
+ export interface ImportResult {
+ /** 鍒涘缓鎴愬姛鐨勫憳宸ュ悕鏁扮粍 */
+ createNames?: string[];
+ /** 鏇存柊鎴愬姛鐨勫憳宸ュ悕鏁扮粍 */
+ updateNames?: string[];
+ /** 瀵煎叆澶辫触闆嗗悎锛宬ey 涓哄憳宸ュ悕锛寁alue 涓哄け璐ュ師鍥� */
+ failureNames?: Record<string, string>;
+ }
}
/** 鏌ヨ鍛樺伐鍒嗛〉鍒楄〃 */
@@ -124,4 +139,32 @@
/** 瀵煎嚭鍛樺伐 */
export function exportEmployee(params: any) {
return requestClient.download('/hrm/employee/export-excel', { params });
+}
+
+/** 涓嬭浇鍛樺伐瀵煎叆妯℃澘 */
+export function importEmployeeTemplate() {
+ return requestClient.download('/hrm/employee/import-template');
+}
+
+/** 瀵煎叆鍛樺伐 */
+export function importEmployee(file: File, updateSupport: boolean) {
+ return requestClient.upload<HrmEmployeeApi.ImportResult>(
+ '/hrm/employee/import',
+ { file, updateSupport },
+ );
+}
+
+/** 鍒犻櫎鏁欒偛缁忓巻 */
+export function deleteEducation(id: number) {
+ return requestClient.delete(`/hrm/employee/education/delete?id=${id}`);
+}
+
+/** 鍒犻櫎宸ヤ綔缁忓巻 */
+export function deleteWorkHistory(id: number) {
+ return requestClient.delete(`/hrm/employee/work-history/delete?id=${id}`);
+}
+
+/** 鍒犻櫎绱ф�ヨ仈绯讳汉 */
+export function deleteEmergencyContact(id: number) {
+ return requestClient.delete(`/hrm/employee/emergency-contact/delete?id=${id}`);
}
\ No newline at end of file
--
Gitblit v1.9.3