From 10253baf7dd53c077bdd41f960230e8887c65149 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 03 十一月 2026 09:21:43 +0800
Subject: [PATCH] feat(app): 同步中亿装配人力资源改动
---
src/pages/hrm/transfer/form.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/pages/hrm/transfer/form.vue b/src/pages/hrm/transfer/form.vue
index 2ee3e9e..64e0b16 100644
--- a/src/pages/hrm/transfer/form.vue
+++ b/src/pages/hrm/transfer/form.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { computed, reactive, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
-import { createTransfer, getHrmDeptList, getHrmDicts, getHrmPostList, getHrmUserList, getTransfer, updateTransfer, type HrmAttachment, type SimpleOption, type Transfer, type UserOption } from "../../../api/hrm";
+import { createTransfer, getHrmDeptList, getHrmDicts, getHrmPostList, getEmployeeSimpleList, getTransfer, updateTransfer, type EmployeeSimple, type HrmAttachment, type SimpleOption, type Transfer } from "../../../api/hrm";
import type { DeptSimple, DictData } from "../../../api/crm";
import { useAuth } from "../../../stores/auth";
import { HRM_DICT, label, options } from "../shared";
@@ -9,25 +9,27 @@
const { hasPermission, state } = useAuth();
const id = ref<number>(); const mode = ref("edit"); const saving = ref(false);
-const dicts = ref<DictData[]>([]); const users = ref<UserOption[]>([]); const depts = ref<DeptSimple[]>([]); const posts = ref<SimpleOption[]>([]);
+const dicts = ref<DictData[]>([]); const employees = ref<EmployeeSimple[]>([]); const depts = ref<DeptSimple[]>([]); const posts = ref<SimpleOption[]>([]);
const attachments = ref<HrmAttachment[]>([]);
const form = reactive<Transfer>({ userId: undefined, currentDeptId: undefined, currentPostId: undefined, targetDeptId: undefined, targetPostId: undefined, transferType: undefined, effectiveDate: "", reason: "", blobIds: [] });
const readonly = computed(() => mode.value === "detail");
const canSave = computed(() => !readonly.value && (id.value ? hasPermission("hrm:transfer:update") : hasPermission("hrm:transfer:create")));
const typeOptions = computed(() => options(dicts.value, HRM_DICT.transferType));
-const userText = computed(() => form.userName || state.user?.nickname || "褰撳墠鐧诲綍鐢ㄦ埛");
+const userText = computed(() => form.userName || employees.value.find(item => item.id === form.userId)?.name || "璇烽�夋嫨璋冨矖浜�");
const currentDeptText = computed(() => depts.value.find(item => item.id === form.currentDeptId)?.name || form.currentDeptName || "璇烽�夋嫨鍘熼儴闂�");
const currentPostText = computed(() => posts.value.find(item => item.id === form.currentPostId)?.name || form.currentPostName || "璇烽�夋嫨鍘熷矖浣�");
const targetDeptText = computed(() => depts.value.find(item => item.id === form.targetDeptId)?.name || form.targetDeptName || "璇烽�夋嫨鐩爣閮ㄩ棬");
const targetPostText = computed(() => posts.value.find(item => item.id === form.targetPostId)?.name || form.targetPostName || "璇烽�夋嫨鐩爣宀椾綅");
+function selectUser(employeeId: number) { const employee = employees.value.find(item => item.id === employeeId); form.userId = employee?.id; form.userName = employee?.name; form.currentDeptId = employee?.deptId; form.currentDeptName = employee?.deptName; form.currentPostId = employee?.postId || employee?.postIds?.[0]; form.currentPostName = employee?.postName; }
+
async function save() {
- if (!state.user?.id || !form.currentDeptId || !form.currentPostId || !form.targetDeptId || !form.targetPostId || form.transferType === undefined || !form.effectiveDate || !form.reason?.trim()) return uni.showToast({ title: "璇峰畬鏁村~鍐欏繀濉」", icon: "none" });
+ if (!form.userId || !form.currentDeptId || !form.currentPostId || !form.targetDeptId || !form.targetPostId || form.transferType === undefined || !form.effectiveDate || !form.reason?.trim()) return uni.showToast({ title: "璇峰畬鏁村~鍐欏繀濉」", icon: "none" });
if (form.currentDeptId === form.targetDeptId) return uni.showToast({ title: "鐩爣閮ㄩ棬涓嶈兘涓庡師閮ㄩ棬鐩稿悓", icon: "none" });
if (form.currentPostId === form.targetPostId) return uni.showToast({ title: "鐩爣宀椾綅涓嶈兘涓庡師宀椾綅鐩稿悓", icon: "none" });
if (!state.accessToken || saving.value) return; saving.value = true;
try {
- const data = { ...form, id: id.value, userId: state.user.id };
+ const data = { ...form, id: id.value };
if (id.value) await updateTransfer(state.accessToken, data); else id.value = await createTransfer(state.accessToken, data);
uni.showToast({ title: "淇濆瓨鎴愬姛", icon: "success" }); setTimeout(() => uni.navigateBack(), 500);
} catch (error) { uni.showToast({ title: error instanceof Error ? error.message : "淇濆瓨澶辫触", icon: "none" }); }
@@ -37,8 +39,8 @@
id.value = query.id ? Number(query.id) : undefined; mode.value = query.mode === "detail" ? "detail" : "edit";
if (!state.accessToken) return;
try {
- const [dictData, userData, deptData, postData] = await Promise.all([getHrmDicts(state.accessToken), getHrmUserList(state.accessToken), getHrmDeptList(state.accessToken), getHrmPostList(state.accessToken)]);
- dicts.value = dictData; users.value = userData; depts.value = deptData; posts.value = postData;
+ const [dictData, userData, deptData, postData] = await Promise.all([getHrmDicts(state.accessToken), getEmployeeSimpleList(state.accessToken), getHrmDeptList(state.accessToken), getHrmPostList(state.accessToken)]);
+ dicts.value = dictData; employees.value = userData; depts.value = deptData; posts.value = postData;
if (id.value) {
const detail = await getTransfer(state.accessToken, id.value);
if (Number(detail.userId) !== Number(state.user?.id)) {
@@ -49,9 +51,7 @@
attachments.value = detail.attachmentList || [];
}
else {
- const current = userData.find(item => item.id === state.user?.id);
- form.userId = state.user?.id; form.userName = state.user?.nickname;
- form.currentDeptId = current?.deptId; form.currentDeptName = current?.deptName || state.user?.dept?.name;
+ Object.assign(form, { userId: undefined, userName: undefined, currentDeptId: undefined, currentDeptName: undefined, currentPostId: undefined, currentPostName: undefined });
}
} catch (error) { uni.showToast({ title: error instanceof Error ? error.message : "鏁版嵁鍔犺浇澶辫触", icon: "none" }); }
});
@@ -59,9 +59,9 @@
<template>
<view class="page"><view class="form-card">
- <view class="field"><text>鐢宠浜�</text><text class="value">{{ userText }}</text></view>
- <view class="field"><text>鍘熼儴闂� <text class="required">*</text></text><picker v-if="!readonly" :range="depts" range-key="name" @change="form.currentDeptId=depts[$event.detail.value].id"><view class="picker"><text>{{ currentDeptText }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ currentDeptText }}</text></view>
- <view class="field"><text>鍘熷矖浣� <text class="required">*</text></text><picker v-if="!readonly" :range="posts" range-key="name" @change="form.currentPostId=posts[$event.detail.value].id"><view class="picker"><text>{{ currentPostText }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ currentPostText }}</text></view>
+ <view class="field"><text>璋冨矖浜� <text class="required">*</text></text><picker v-if="!readonly" :range="employees" range-key="name" @change="selectUser(employees[$event.detail.value].id)"><view class="picker"><text>{{ userText }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ userText }}</text></view>
+ <view class="field"><text>鍘熼儴闂� <text class="required">*</text></text><text class="value">{{ currentDeptText }}</text></view>
+ <view class="field"><text>鍘熷矖浣� <text class="required">*</text></text><text class="value">{{ currentPostText }}</text></view>
<view class="field"><text>鐩爣閮ㄩ棬 <text class="required">*</text></text><picker v-if="!readonly" :range="depts" range-key="name" @change="form.targetDeptId=depts[$event.detail.value].id"><view class="picker"><text>{{ targetDeptText }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ targetDeptText }}</text></view>
<view class="field"><text>鐩爣宀椾綅 <text class="required">*</text></text><picker v-if="!readonly" :range="posts" range-key="name" @change="form.targetPostId=posts[$event.detail.value].id"><view class="picker"><text>{{ targetPostText }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ targetPostText }}</text></view>
<view class="field"><text>璋冨矖绫诲瀷 <text class="required">*</text></text><picker v-if="!readonly" :range="typeOptions" range-key="label" @change="form.transferType=Number(typeOptions[$event.detail.value].value)"><view class="picker"><text>{{ label(dicts,HRM_DICT.transferType,form.transferType,"璇烽�夋嫨璋冨矖绫诲瀷") }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ label(dicts,HRM_DICT.transferType,form.transferType) }}</text></view>
--
Gitblit v1.9.3