From 397218a689b159fa8018c249807326b195576f16 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 14:12:00 +0800
Subject: [PATCH] fix(hrm): 修复新增调岗申请报 500(原部门/原岗位未回填)
---
src/views/hrm/transfer/data.ts | 21 ++++++++++
src/views/hrm/transfer/modules/form.vue | 40 +++++++++++++-------
2 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/src/views/hrm/transfer/data.ts b/src/views/hrm/transfer/data.ts
index e6f2411..ca265cb 100644
--- a/src/views/hrm/transfer/data.ts
+++ b/src/views/hrm/transfer/data.ts
@@ -6,6 +6,7 @@
import { getDictOptions } from '#/packages/effects/hooks/src';
import { getDeptList } from '#/api/system/dept';
+import { getEmployeeSimpleList } from '#/api/hrm/employee';
import { getSimplePostList } from '#/api/system/post';
import { handleTree } from '#/packages/utils/src';
@@ -24,6 +25,26 @@
},
},
{
+ // 琚皟宀楀憳宸ワ細鍘熼儴闂�/鍘熷矖浣嶇敱鍚庣鎸夊憳宸ユ。妗堣嚜鍔ㄥ甫鍑猴紝鍓嶇鍙渶瑕侀�変汉
+ fieldName: 'employeeId',
+ label: '琚皟宀楀憳宸�',
+ component: 'ApiSelect',
+ componentProps: {
+ api: getEmployeeSimpleList,
+ labelField: 'name',
+ valueField: 'id',
+ placeholder: '璇烽�夋嫨瑕佽皟宀楃殑鍛樺伐',
+ showSearch: true,
+ filterOption: (input: string, option: any) =>
+ String(option?.label ?? '')
+ .toLowerCase()
+ .includes(input.toLowerCase()),
+ // 鏌ョ湅/淇敼鏃朵笉鍏佽鏇存崲琚皟宀椾汉
+ disabled: formType !== 'create',
+ },
+ rules: 'selectRequired',
+ },
+ {
fieldName: 'currentDeptId',
component: 'Input',
dependencies: {
diff --git a/src/views/hrm/transfer/modules/form.vue b/src/views/hrm/transfer/modules/form.vue
index 6e76835..7578dd4 100644
--- a/src/views/hrm/transfer/modules/form.vue
+++ b/src/views/hrm/transfer/modules/form.vue
@@ -17,7 +17,15 @@
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
-const currentEmployeeId = ref<number>();
+
+// 鍛樺伐绠�鍗曞垪琛ㄥ仛涓�娆$紦瀛橈紝渚涖�岄�変腑鍛樺伐鍚庡甫鍑哄師閮ㄩ棬銆嶄娇鐢�
+let employeeCache: any[] = [];
+async function loadEmployees() {
+ if (employeeCache.length === 0) {
+ employeeCache = await getEmployeeSimpleList();
+ }
+ return employeeCache;
+}
const isDetail = computed(() => formType.value === 'detail');
const getTitle = computed(() => {
@@ -39,6 +47,22 @@
layout: 'horizontal',
schema: [],
showDefaultActions: false,
+ // 閫変腑銆岃璋冨矖鍛樺伐銆嶅悗甯﹀嚭鍘熼儴闂�/鍘熷矖浣嶏紙浠呯敤浜庡睍绀猴紱
+ // 鐪熸鐨� currentDeptId / currentPostId 鐢卞悗绔寜鍛樺伐妗f琛ュ叏锛岄伩鍏嶉潪绌虹害鏉熸姤閿欙級
+ handleValuesChange: async (values: any, fieldsChanged: string[]) => {
+ if (!fieldsChanged.includes('employeeId')) {
+ return;
+ }
+ const employees = await loadEmployees();
+ const employee = employees.find((item: any) => item.id === values.employeeId);
+ if (!employee) {
+ return;
+ }
+ await formApi.setValues({
+ currentDeptName: employee.deptName || '',
+ currentPostName: employee.postName || '',
+ });
+ },
});
const [Modal, modalApi] = useVbenModal({
@@ -53,7 +77,6 @@
}
modalApi.lock();
const data = (await formApi.getValues()) as HrmTransferApi.Transfer;
- data.employeeId = currentEmployeeId.value;
try {
if (data.id) {
await updateTransfer(data);
@@ -77,23 +100,12 @@
formApi.setDisabled(data.formType === 'detail');
modalApi.setState({ showConfirmButton: data.formType !== 'detail' });
if (!data?.id) {
- // 鏂板鏃讹紝鑷姩鑾峰彇褰撳墠鐧诲綍鍛樺伐鐨勯儴闂ㄥ拰宀椾綅淇℃伅
- const employees = await getEmployeeSimpleList();
- // TODO: 杩欓噷搴旇鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇瀵瑰簲鐨勫憳宸ヤ俊鎭紝鏆傛椂鍙栫涓�涓憳宸ヤ綔涓虹ず渚�
- const currentEmployee = employees[0];
- if (currentEmployee) {
- currentEmployeeId.value = currentEmployee.id;
- await formApi.setValues({
- currentDeptName: currentEmployee.deptName,
- currentPostName: currentEmployee.postName,
- });
- }
+ // 鏂板锛氳璋冨矖鍛樺伐鐢辩敤鎴峰湪琛ㄥ崟閲岄�夋嫨锛岄�変腑鍚庤嚜鍔ㄥ甫鍑哄師閮ㄩ棬/鍘熷矖浣�
return;
}
modalApi.lock();
try {
const transfer = await getTransfer(data.id);
- currentEmployeeId.value = transfer.employeeId;
await formApi.setValues(transfer);
if (transfer.attachmentList?.length) {
await formApi.setFieldValue('blobIds', transfer.attachmentList.map(item => ({
--
Gitblit v1.9.3