From 861cf085888750e51ebcc0a22b87bda58ec371a6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 06 十一月 2026 15:58:08 +0800
Subject: [PATCH] feat(hrm): 调岗申请增加调岗人员选择,原部门/原岗位自动带出
---
src/views/hrm/transfer/data.ts | 21 +++++++++-
src/api/hrm/transfer/index.ts | 4 +-
src/views/hrm/transfer/detail/approve/index.vue | 2
src/views/hrm/transfer/modules/form.vue | 68 ++++++++++++++++++++++++++--------
4 files changed, 74 insertions(+), 21 deletions(-)
diff --git a/src/api/hrm/transfer/index.ts b/src/api/hrm/transfer/index.ts
index e992674..cb580f3 100644
--- a/src/api/hrm/transfer/index.ts
+++ b/src/api/hrm/transfer/index.ts
@@ -7,8 +7,8 @@
/** 璋冨矖鐢宠 */
export interface Transfer {
id?: number;
- employeeId?: number;
- employeeName?: string;
+ userId?: number;
+ userName?: string;
currentDeptId?: number;
currentDeptName?: string;
currentPostId?: number;
diff --git a/src/views/hrm/transfer/data.ts b/src/views/hrm/transfer/data.ts
index c0e1cf3..de54e82 100644
--- a/src/views/hrm/transfer/data.ts
+++ b/src/views/hrm/transfer/data.ts
@@ -1,6 +1,9 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { HrmTransferApi } from '#/api/hrm/transfer';
+import type { SystemUserApi } from '#/api/system/user';
+
+import { markRaw } from 'vue';
import { DICT_TYPE } from '#/packages/constants/src';
import { getDictOptions } from '#/packages/effects/hooks/src';
@@ -8,12 +11,16 @@
import { getDeptList } from '#/api/system/dept';
import { getSimplePostList } from '#/api/system/post';
import { handleTree } from '#/packages/utils/src';
+import { UserSelect } from '#/views/system/user/components';
/** 琛ㄥ崟绫诲瀷 */
export type FormType = 'create' | 'detail' | 'update';
/** 鏂板/淇敼璋冨矖鐢宠鐨勮〃鍗� */
-export function useFormSchema(formType: FormType): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ onUserChange?: (user?: SystemUserApi.User) => void,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -22,6 +29,16 @@
triggerFields: [''],
show: () => false,
},
+ },
+ {
+ fieldName: 'userId',
+ label: '璋冨矖浜哄憳',
+ component: markRaw(UserSelect),
+ componentProps: {
+ placeholder: '璇烽�夋嫨璋冨矖浜哄憳',
+ onChange: onUserChange,
+ },
+ rules: 'selectRequired',
},
{
fieldName: 'currentDeptId',
@@ -175,7 +192,7 @@
export function useGridColumns(): VxeTableGridOptions<HrmTransferApi.Transfer>['columns'] {
return [
{ field: 'id', title: '鐢宠缂栧彿', width: 80 },
- { field: 'employeeName', title: '鐢宠浜�', minWidth: 100 },
+ { field: 'userName', title: '璋冨矖浜哄憳', minWidth: 100 },
{ field: 'currentDeptName', title: '鍘熼儴闂�', minWidth: 120 },
{ field: 'currentPostName', title: '鍘熷矖浣�', minWidth: 120 },
{ field: 'targetDeptName', title: '鐩爣閮ㄩ棬', minWidth: 120 },
diff --git a/src/views/hrm/transfer/detail/approve/index.vue b/src/views/hrm/transfer/detail/approve/index.vue
index 5d983ef..0b8ce6a 100644
--- a/src/views/hrm/transfer/detail/approve/index.vue
+++ b/src/views/hrm/transfer/detail/approve/index.vue
@@ -30,7 +30,7 @@
bordered: true,
column: 2,
schema: [
- { label: '鍛樺伐濮撳悕', field: 'employeeName', render: textRender },
+ { label: '璋冨矖浜哄憳', field: 'userName', render: textRender },
{ label: '褰撳墠閮ㄩ棬', field: 'currentDeptName', render: textRender },
{ label: '褰撳墠鑱屼綅', field: 'currentPostName', render: textRender },
{ label: '鐩爣閮ㄩ棬', field: 'targetDeptName', render: textRender },
diff --git a/src/views/hrm/transfer/modules/form.vue b/src/views/hrm/transfer/modules/form.vue
index 6e76835..8544f4e 100644
--- a/src/views/hrm/transfer/modules/form.vue
+++ b/src/views/hrm/transfer/modules/form.vue
@@ -1,8 +1,12 @@
<script lang="ts" setup>
import type { FormType } from '../data';
import type { HrmTransferApi } from '#/api/hrm/transfer';
+import type { SystemPostApi } from '#/api/system/post';
+import type { SystemUserApi } from '#/api/system/user';
import { computed, ref } from 'vue';
+
+import { useUserStore } from '@vben/stores';
import { useVbenModal } from '#/packages/effects/common-ui/src';
@@ -10,14 +14,15 @@
import { useVbenForm } from '#/adapter/form';
import { createTransfer, getTransfer, updateTransfer } from '#/api/hrm/transfer';
-import { getEmployeeSimpleList } from '#/api/hrm/employee';
+import { getSimplePostList } from '#/api/system/post';
+import { getUser } from '#/api/system/user';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
-const currentEmployeeId = ref<number>();
+const userStore = useUserStore();
const isDetail = computed(() => formType.value === 'detail');
const getTitle = computed(() => {
@@ -41,6 +46,44 @@
showDefaultActions: false,
});
+/** 宀椾綅鍒楄〃缂撳瓨锛堢敤浜庢妸宀椾綅 ID 鍥炴樉鎴愬悕绉帮級 */
+const postList = ref<SystemPostApi.Post[]>([]);
+
+/** 鏍规嵁宀椾綅缂栧彿鍙栧矖浣嶅悕绉� */
+async function getPostName(postId?: number) {
+ if (!postId) {
+ return undefined;
+ }
+ if (postList.value.length === 0) {
+ postList.value = await getSimplePostList();
+ }
+ return postList.value.find((item) => item.id === postId)?.name;
+}
+
+/** 閫夋嫨璋冨矖浜哄憳鍚庯紝鑷姩甯﹀嚭鍏跺師閮ㄩ棬銆佸師宀椾綅 */
+async function fillCurrentByUser(user?: SystemUserApi.User) {
+ if (!user?.id) {
+ await formApi.setValues({
+ currentDeptId: undefined,
+ currentDeptName: undefined,
+ currentPostId: undefined,
+ currentPostName: undefined,
+ });
+ return;
+ }
+ // 閫夋嫨缁勪欢甯﹀洖鐨勬暟鎹彲鑳界己灏戦儴闂ㄥ悕绉� / 宀椾綅锛屾寜缂栧彿鍐嶆煡涓�娆$敤鎴疯鎯�
+ const detail = !user.deptName || !user.postIds?.length
+ ? await getUser(user.id)
+ : user;
+ const postId = detail.postIds?.[0] ? Number(detail.postIds[0]) : undefined;
+ await formApi.setValues({
+ currentDeptId: detail.deptId,
+ currentDeptName: detail.deptName,
+ currentPostId: postId,
+ currentPostName: await getPostName(postId),
+ });
+}
+
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
if (isDetail.value) {
@@ -53,7 +96,6 @@
}
modalApi.lock();
const data = (await formApi.getValues()) as HrmTransferApi.Transfer;
- data.employeeId = currentEmployeeId.value;
try {
if (data.id) {
await updateTransfer(data);
@@ -73,27 +115,21 @@
}
const data = modalApi.getData<{ formType: FormType; id?: number }>();
formType.value = data.formType;
- formApi.setState({ schema: useFormSchema(data.formType) });
+ formApi.setState({ schema: useFormSchema(data.formType, fillCurrentByUser) });
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,
- });
+ // 鏂板鏃堕粯璁ゅ甫鍑哄綋鍓嶇櫥褰曚汉锛屽苟鍥炲~鍏跺師閮ㄩ棬 / 鍘熷矖浣�
+ const loginUserId = userStore.userInfo?.id;
+ if (loginUserId) {
+ formApi.setFieldValue('userId', loginUserId);
+ await fillCurrentByUser(await getUser(loginUserId));
}
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 => ({
@@ -115,4 +151,4 @@
<Modal :title="getTitle" class="w-[600px]">
<Form class="mx-4" />
</Modal>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.3