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/salary-calculation/index.vue     |   10 +++++++---
 src/config/company.ts                          |    2 +-
 src/api/hrm.ts                                 |    9 +++++----
 src/pages/hrm/attendance-rule/index.vue        |    2 +-
 src/pages/hrm/social-security-scheme/index.vue |    4 ++--
 src/pages/hrm/transfer/form.vue                |   26 +++++++++++++-------------
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/api/hrm.ts b/src/api/hrm.ts
index 829eaa4..b991358 100644
--- a/src/api/hrm.ts
+++ b/src/api/hrm.ts
@@ -5,7 +5,7 @@
 export interface SimpleOption { id: number; name: string; code?: string; parentId?: number; status?: number }
 export interface HrmAttachment { id: number; name?: string; url?: string; path?: string; size?: number }
 export interface UserOption { id: number; nickname?: string; username?: string; deptId?: number; deptName?: string }
-export interface EmployeeSimple { id: number; employeeNo: string; name: string; deptName?: string; employeeStatus?: number }
+export interface EmployeeSimple { id: number; employeeNo: string; name: string; deptId?: number; deptName?: string; postId?: number; postIds?: number[]; postName?: string; employeeStatus?: number }
 export interface Employee {
   id?: number; deptId?: number; deptName?: string; postId?: number; postName?: string;
   roleIds?: number[]; roleNames?: string; employeeNo?: string; name?: string; gender?: number; birthday?: string; phone?: string;
@@ -53,7 +53,7 @@
   id?: number; name?: string; deptId?: number; deptName?: string; workStartTime?: string; workEndTime?: string;
   lateAllowMinutes?: number; earlyAllowMinutes?: number; overtimeThreshold?: number; status?: number; remark?: string;
   locationName?: string; locationAddress?: string; longitude?: number; latitude?: number; radiusMeters?: number;
-  locationRequired?: boolean; coordinateSystem?: "WGS84";
+  locationRequired?: boolean; coordinateSystem?: "WGS84"; effectiveStartDate?: string; effectiveEndDate?: string;
 }
 export interface AttendanceRecord {
   id?: number; userId?: number; userName?: string; deptId?: number; deptName?: string; phone?: string; date?: string;
@@ -191,11 +191,11 @@
 export interface AttendanceException extends HrmRow { userId?: number; userName?: string; deptName?: string; date?: string; exceptionType?: number; exceptionTypeName?: string; reason?: string; blobIds?: number[]; attachmentList?: HrmAttachment[]; status?: number; processInstanceId?: string; remark?: string; createTime?: string }
 export interface EmployeeSchedule extends HrmRow { employeeId?: number; employeeName?: string; employeeNo?: string; date?: string; shiftId?: number; shiftName?: string; shiftColor?: string; remark?: string }
 export interface SalaryStructure extends HrmRow { name?: string; overtimePayRatio?: number; restDayOvertimePayRatio?: number; legalHolidayOvertimePayRatio?: number; status?: number; remark?: string }
-export interface SocialSecurityScheme extends HrmRow { name?: string; effectiveDate?: string; pensionCompanyRatio?: number; pensionPersonalRatio?: number; medicalCompanyRatio?: number; medicalPersonalRatio?: number; unemploymentCompanyRatio?: number; unemploymentPersonalRatio?: number; workInjuryRatio?: number; maternityRatio?: number; housingFundCompanyRatio?: number; housingFundPersonalRatio?: number; status?: number; remark?: string }
+export interface SocialSecurityScheme extends HrmRow { name?: string; effectiveDate?: string; pensionCompanyRatio?: number; pensionPersonalRatio?: number; medicalCompanyRatio?: number; medicalPersonalRatio?: number; unemploymentCompanyRatio?: number; unemploymentPersonalRatio?: number; workInjuryRatio?: number; maternityRatio?: number; seriousIllnessCompanyRatio?: number; seriousIllnessPersonalRatio?: number; longTermCareCompanyRatio?: number; longTermCarePersonalRatio?: number; housingFundCompanyRatio?: number; housingFundPersonalRatio?: number; status?: number; remark?: string }
 export interface TaxRateConfig extends HrmRow { name?: string; effectiveDate?: string; level?: number; minAmount?: number; maxAmount?: number; taxRate?: number; quickDeduction?: number }
 export interface LeaveTypeConfig extends HrmRow { leaveType?: number; name?: string; deductionRatio?: number; remark?: string; status?: number }
 export interface EmployeeSocialSecurity extends HrmRow { userId?: number; userName?: string; deptName?: string; socialSecuritySchemeId?: number; schemeName?: string; socialSecurityBase?: number; housingFundBase?: number; effectiveDate?: string; status?: number; remark?: string }
-export interface SalaryCalculation extends HrmRow { no?: string; period?: string; userId?: number; userName?: string; deptId?: number; deptName?: string; baseSalary?: number; performanceSalary?: number; overtimePay?: number; mealAllowance?: number; transportAllowance?: number; otherAllowance?: number; socialSecurityDeduction?: number; housingFundDeduction?: number; taxDeduction?: number; otherDeduction?: number; leaveDeduction?: number; actualSalary?: number; workDays?: number; overtimeHours?: number; totalWorkHours?: number; status?: number; statusName?: string; remark?: string; createTime?: string }
+export interface SalaryCalculation extends HrmRow { no?: string; period?: string; userId?: number; userName?: string; deptId?: number; deptName?: string; baseSalary?: number; postSalary?: number; senioritySalary?: number; performanceSalary?: number; fullAttendanceBonus?: number; overtimePay?: number; mealAllowance?: number; transportAllowance?: number; otherAllowance?: number; socialSecurityDeduction?: number; housingFundDeduction?: number; taxDeduction?: number; otherDeduction?: number; leaveDeduction?: number; actualSalary?: number; workDays?: number; actualDays?: number; overtimeHours?: number; totalWorkHours?: number; status?: number; statusName?: string; remark?: string; createTime?: string }
 export interface SalaryPayment extends HrmRow { no?: string; period?: string; totalAmount?: number; totalCount?: number; paymentMethod?: number; paymentTime?: string; status?: number; blobIds?: number[]; attachmentList?: HrmAttachment[]; remark?: string; createTime?: string }
 export interface SalaryPaymentDetail extends SalaryCalculation { paymentId?: number; calculationId?: number; paymentTime?: string }
 
@@ -250,6 +250,7 @@
 export function deleteEmployeeSocialSecurity(token: string, id: number) { return request<boolean>(`/hrm/salary/employee-social-security/delete${query({ id })}`, { method: "DELETE", header: header(token) }); }
 export function getSalaryCalculationPage(token: string, params: Record<string, unknown>) { return request<PageResult<SalaryCalculation>>(`/hrm/salary/calculation/page${query(params as Record<string, string | number | boolean | undefined>)}`, { header: header(token) }); }
 export function calculateSalary(token: string, params: { period: string; deptId?: number }) { return request<boolean>(`/hrm/salary/calculation/calculate${query(params)}`, { method: "POST", header: header(token) }); }
+export function updateSalaryCalculation(token: string, data: SalaryCalculation) { return request<boolean>("/hrm/salary/calculation/update", { method: "PUT", data: data as Record<string, unknown>, header: header(token) }); }
 export function confirmSalary(token: string, ids: number[]) { return request<boolean>("/hrm/salary/calculation/confirm", { method: "POST", data: { ids }, header: header(token) }); }
 export function revokeSalary(token: string, ids: number[]) { return request<boolean>("/hrm/salary/calculation/revoke", { method: "POST", data: { ids }, header: header(token) }); }
 export function deleteSalaryCalculation(token: string, id: number) { return request<boolean>(`/hrm/salary/calculation/delete${query({ id })}`, { method: "DELETE", header: header(token) }); }
diff --git a/src/config/company.ts b/src/config/company.ts
index 579960e..e5aab01 100644
--- a/src/config/company.ts
+++ b/src/config/company.ts
@@ -83,6 +83,6 @@
 };
 
 /** 鈽� 鎵撳寘寮�鍏筹細鍙敼杩欎竴琛� */
-export const ACTIVE_COMPANY: CompanyCode = "changhui";
+export const ACTIVE_COMPANY: CompanyCode = "zhongyi";
 
 export const APP_COMPANY: AppCompanyConfig = COMPANY_PROFILES[ACTIVE_COMPANY];
diff --git a/src/pages/hrm/attendance-rule/index.vue b/src/pages/hrm/attendance-rule/index.vue
index 4e973a3..cc58467 100644
--- a/src/pages/hrm/attendance-rule/index.vue
+++ b/src/pages/hrm/attendance-rule/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
 import HrmCrudPage, { type CrudConfig } from "../components/HrmCrudPage.vue";
 import { createAttendanceRule, deleteAttendanceRule, getAttendanceRulePage, updateAttendanceRule } from "../../../api/hrm";
-const config: CrudConfig = { title:"鑰冨嫟瑙勫垯", permission:"hrm:attendance-rule", fields:[{key:"name",label:"瑙勫垯鍚嶇О",required:true},{key:"deptId",label:"閮ㄩ棬ID",type:"number"},{key:"workStartTime",label:"涓婄彮鏃堕棿",required:true},{key:"workEndTime",label:"涓嬬彮鏃堕棿",required:true},{key:"lateAllowMinutes",label:"杩熷埌瀹介檺(鍒嗛挓)",type:"number"},{key:"earlyAllowMinutes",label:"鏃╅��瀹介檺(鍒嗛挓)",type:"number"},{key:"overtimeThreshold",label:"鍔犵彮璧风畻(鍒嗛挓)",type:"number"},{key:"locationName",label:"鎵撳崱鍦扮偣"},{key:"locationAddress",label:"鍦扮偣鍦板潃"},{key:"longitude",label:"缁忓害",type:"number"},{key:"latitude",label:"绾害",type:"number"},{key:"radiusMeters",label:"鏈夋晥鑼冨洿(绫�)",type:"number"},{key:"locationRequired",label:"蹇呴』鍦ㄨ寖鍥村唴",type:"switch"},{key:"remark",label:"澶囨敞"}], cardFields:[{key:"name",label:"鍚嶇О"},{key:"deptName",label:"閮ㄩ棬"},{key:"workStartTime",label:"涓婄彮"},{key:"workEndTime",label:"涓嬬彮"},{key:"locationName",label:"鎵撳崱鍦扮偣"},{key:"radiusMeters",label:"鑼冨洿(绫�)"}], page:true, load:(t,k,p,s)=>getAttendanceRulePage(t,{pageNo:p,pageSize:s,name:k||undefined}), create:createAttendanceRule, update:updateAttendanceRule, remove:deleteAttendanceRule };
+const config: CrudConfig = { title:"鑰冨嫟瑙勫垯", permission:"hrm:attendance-rule", fields:[{key:"name",label:"瑙勫垯鍚嶇О",required:true},{key:"deptId",label:"閮ㄩ棬ID",type:"number"},{key:"workStartTime",label:"涓婄彮鏃堕棿",required:true},{key:"workEndTime",label:"涓嬬彮鏃堕棿",required:true},{key:"lateAllowMinutes",label:"杩熷埌瀹介檺(鍒嗛挓)",type:"number"},{key:"earlyAllowMinutes",label:"鏃╅��瀹介檺(鍒嗛挓)",type:"number"},{key:"overtimeThreshold",label:"鍔犵彮璧风畻(鍒嗛挓)",type:"number"},{key:"effectiveStartDate",label:"鐢熸晥寮�濮嬫棩鏈�"},{key:"effectiveEndDate",label:"鐢熸晥缁撴潫鏃ユ湡"},{key:"locationName",label:"鎵撳崱鍦扮偣"},{key:"locationAddress",label:"鍦扮偣鍦板潃"},{key:"longitude",label:"缁忓害",type:"number"},{key:"latitude",label:"绾害",type:"number"},{key:"radiusMeters",label:"鏈夋晥鑼冨洿(绫�)",type:"number"},{key:"locationRequired",label:"蹇呴』鍦ㄨ寖鍥村唴",type:"switch"},{key:"remark",label:"澶囨敞"}], cardFields:[{key:"name",label:"鍚嶇О"},{key:"deptName",label:"閮ㄩ棬"},{key:"workStartTime",label:"涓婄彮"},{key:"workEndTime",label:"涓嬬彮"},{key:"effectiveStartDate",label:"鐢熸晥寮�濮�"},{key:"effectiveEndDate",label:"鐢熸晥缁撴潫"},{key:"locationName",label:"鎵撳崱鍦扮偣"},{key:"radiusMeters",label:"鑼冨洿(绫�)"}], page:true, load:(t,k,p,s)=>getAttendanceRulePage(t,{pageNo:p,pageSize:s,name:k||undefined}), create:createAttendanceRule, update:updateAttendanceRule, remove:deleteAttendanceRule };
 </script><template><HrmCrudPage :config="config" /></template>
diff --git a/src/pages/hrm/salary-calculation/index.vue b/src/pages/hrm/salary-calculation/index.vue
index 5131b77..fca04cf 100644
--- a/src/pages/hrm/salary-calculation/index.vue
+++ b/src/pages/hrm/salary-calculation/index.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import { onPullDownRefresh, onReachBottom, onShow } from "@dcloudio/uni-app";
-import { calculateSalary, confirmSalary, deleteSalaryCalculation, getSalaryCalculationPage, revokeSalary, type SalaryCalculation } from "../../../api/hrm";
+import { calculateSalary, confirmSalary, deleteSalaryCalculation, getSalaryCalculationPage, revokeSalary, updateSalaryCalculation, type SalaryCalculation } from "../../../api/hrm";
 import { useAuth } from "../../../stores/auth";
 import { confirm, money, toast } from "../shared";
 const { hasPermission, state } = useAuth();
-const rows = ref<SalaryCalculation[]>([]), period = ref(new Date().toISOString().slice(0, 7)), loading = ref(false), pageNo = ref(1), total = ref(0);
+const rows = ref<SalaryCalculation[]>([]), period = ref(new Date().toISOString().slice(0, 7)), loading = ref(false), pageNo = ref(1), total = ref(0), editing = ref<SalaryCalculation>();
 const pageSize = 15;
 const canQuery = computed(() => hasPermission("hrm:salary-calculation:query"));
 const hasMore = computed(() => rows.value.length < total.value);
@@ -26,6 +26,10 @@
   try { await calculateSalary(state.accessToken, { period: period.value }); toast("鏍哥畻瀹屾垚"); await load(true); }
   catch (error) { toast(error instanceof Error ? error.message : "鏍哥畻澶辫触"); }
 }
+const editFields: Array<[keyof SalaryCalculation, string]> = [["baseSalary","鍩烘湰宸ヨ祫"],["postSalary","宀椾綅宸ヨ祫"],["senioritySalary","宸ラ緞宸ヨ祫"],["performanceSalary","缁╂晥宸ヨ祫"],["fullAttendanceBonus","鍏ㄥ嫟濂�"],["overtimePay","鍔犵彮宸ヨ祫"],["mealAllowance","椁愯ˉ"],["transportAllowance","浜ら�氳ˉ璐�"],["otherAllowance","鍏朵粬琛ヨ创"],["socialSecurityDeduction","绀句繚鎵f"],["housingFundDeduction","鍏Н閲戞墸娆�"],["taxDeduction","涓◣鎵f"],["otherDeduction","鍏朵粬鎵f"],["leaveDeduction","璇峰亣鎵f"]];
+function openEdit(row: SalaryCalculation) { editing.value = { ...row }; }
+function recalculate() { if (!editing.value) return; const income = [editing.value.baseSalary,editing.value.postSalary,editing.value.senioritySalary,editing.value.performanceSalary,editing.value.fullAttendanceBonus,editing.value.overtimePay,editing.value.mealAllowance,editing.value.transportAllowance,editing.value.otherAllowance].reduce((sum,value)=>sum+Number(value||0),0); const deduction = [editing.value.socialSecurityDeduction,editing.value.housingFundDeduction,editing.value.taxDeduction,editing.value.otherDeduction,editing.value.leaveDeduction].reduce((sum,value)=>sum+Number(value||0),0); editing.value.actualSalary = Number((income-deduction).toFixed(2)); }
+async function saveEdit() { if (!state.accessToken || !editing.value) return; recalculate(); try { await updateSalaryCalculation(state.accessToken, editing.value); toast("淇濆瓨鎴愬姛"); editing.value = undefined; await load(true); } catch (error) { toast(error instanceof Error ? error.message : "淇濆瓨澶辫触"); } }
 async function action(row: SalaryCalculation, type: "confirm" | "revoke" | "delete") {
   const label = type === "confirm" ? "纭" : type === "revoke" ? "鎾ら攢纭" : "鍒犻櫎";
   if (!state.accessToken || !row.id || !await confirm("纭" + label + "璇ヨ柂閰褰曪紵")) return;
@@ -39,4 +43,4 @@
 onShow(() => load(true));
 onPullDownRefresh(() => load(true));
 onReachBottom(() => { if (hasMore.value) load(false); });
-</script><template><view class="page"><template v-if="canQuery"><view class="search"><input v-model="period" placeholder="钖叕鍛ㄦ湡 YYYY-MM" @confirm="load"/><text @click="load">鏌ヨ</text></view><view v-if="hasPermission('hrm:salary-calculation:calculate')" class="top-actions"><button @click="calc">鎵ц钖叕鏍哥畻</button></view><view v-for="row in rows" :key="row.id" class="card"><view class="head"><view class="head-main"><text class="name">{{row.userName||'--'}}</text><text class="sub">{{row.no||'--'}} 路 {{row.deptName||'--'}}</text></view><text :class="['tag',row.status===1?'tag-green':'tag-blue']">{{row.statusName|| (row.status===1?'宸茬‘璁�':'寰呯‘璁�')}}</text></view><view class="grid"><text>鍩烘湰宸ヨ祫锛歿{money(row.baseSalary)}}</text><text>缁╂晥宸ヨ祫锛歿{money(row.performanceSalary)}}</text><text>鍔犵彮宸ヨ祫锛歿{money(row.overtimePay)}}</text><text>绀句繚鎵f锛歿{money(row.socialSecurityDeduction)}}</text><text>鍏Н閲戞墸娆撅細{{money(row.housingFundDeduction)}}</text><text>涓◣锛歿{money(row.taxDeduction)}}</text><text>瀹炲彂宸ヨ祫锛歿{money(row.actualSalary)}}</text><text>鍑哄嫟锛歿{row.workDays??0}} 澶�</text></view><view class="actions"><button v-if="row.status===0&&hasPermission('hrm:salary-calculation:confirm')" @click="action(row,'confirm')">纭</button><button v-if="row.status===1&&hasPermission('hrm:salary-calculation:confirm')" @click="action(row,'revoke')">鎾ら攢纭</button><button v-if="row.status===0&&hasPermission('hrm:salary-calculation:delete')" class="danger" @click="action(row,'delete')">鍒犻櫎</button></view></view><view v-if="!rows.length" class="state">{{loading?'鍔犺浇涓�...':'鏆傛棤钖叕鏍哥畻璁板綍'}}</view><view v-else class="state more">{{loading ? "鍔犺浇涓�..." : hasMore ? "涓婃媺鍔犺浇鏇村" : "娌℃湁鏇村浜�"}}</view></template><view v-else class="state">鏆傛棤钖叕鏍哥畻鏌ョ湅鏉冮檺</view></view></template><style scoped lang="scss">@import "../list.scss";.top-actions{display:flex;justify-content:flex-end;margin-bottom:18rpx}.top-actions button{margin:0;color:var(--color-primary, #1769d8);font-size:24rpx;background:#fff}</style>
+</script><template><view class="page"><template v-if="canQuery"><view class="search"><input v-model="period" placeholder="钖叕鍛ㄦ湡 YYYY-MM" @confirm="load"/><text @click="load">鏌ヨ</text></view><view v-if="hasPermission('hrm:salary-calculation:calculate')" class="top-actions"><button @click="calc">鎵ц钖叕鏍哥畻</button></view><view v-for="row in rows" :key="row.id" class="card"><view class="head"><view class="head-main"><text class="name">{{row.userName||'--'}}</text><text class="sub">{{row.no||'--'}} 路 {{row.deptName||'--'}}</text></view><text :class="['tag',row.status===1?'tag-green':'tag-blue']">{{row.statusName|| (row.status===1?'宸茬‘璁�':'寰呯‘璁�')}}</text></view><view class="grid"><text>鍩烘湰宸ヨ祫锛歿{money(row.baseSalary)}}</text><text>宀椾綅宸ヨ祫锛歿{money(row.postSalary)}}</text><text>宸ラ緞宸ヨ祫锛歿{money(row.senioritySalary)}}</text><text>缁╂晥宸ヨ祫锛歿{money(row.performanceSalary)}}</text><text>鍏ㄥ嫟濂栵細{{money(row.fullAttendanceBonus)}}</text><text>鍔犵彮宸ヨ祫锛歿{money(row.overtimePay)}}</text><text>绀句繚鎵f锛歿{money(row.socialSecurityDeduction)}}</text><text>鍏Н閲戞墸娆撅細{{money(row.housingFundDeduction)}}</text><text>涓◣锛歿{money(row.taxDeduction)}}</text><text>瀹炲彂宸ヨ祫锛歿{money(row.actualSalary)}}</text><text>搴斿嚭锛歿{row.workDays??0}} 澶�</text><text>瀹炲嚭锛歿{row.actualDays??0}} 澶�</text></view><view class="actions"><button v-if="row.status===0&&hasPermission('hrm:salary-calculation:confirm')" @click="action(row,'confirm')">纭</button><button v-if="row.status===1&&hasPermission('hrm:salary-calculation:confirm')" @click="action(row,'revoke')">鎾ら攢纭</button><button v-if="row.status===0&&hasPermission('hrm:salary-calculation:delete')" class="danger" @click="action(row,'delete')">鍒犻櫎</button></view></view><view v-if="!rows.length" class="state">{{loading?'鍔犺浇涓�...':'鏆傛棤钖叕鏍哥畻璁板綍'}}</view><view v-else class="state more">{{loading ? "鍔犺浇涓�..." : hasMore ? "涓婃媺鍔犺浇鏇村" : "娌℃湁鏇村浜�"}}</view></template><view v-else class="state">鏆傛棤钖叕鏍哥畻鏌ョ湅鏉冮檺</view></view><view v-if="editing" class="panel"><view class="form-card"><view class="section-title">淇敼钖叕鏍哥畻</view><view v-for="field in editFields" :key="field[0]" class="field"><text>{{field[1]}}</text><input :value="editing[field[0]] ?? 0" type="digit" @input="editing[field[0]]=Number($event.detail.value);recalculate()" /></view><view class="field"><text>搴斿嚭澶╂暟</text><input v-model.number="editing.workDays" type="number" /></view><view class="field"><text>瀹炲嚭澶╂暟</text><input v-model.number="editing.actualDays" type="number" /></view><view class="field"><text>鍔犵彮鏃堕暱</text><input v-model.number="editing.overtimeHours" type="digit" /></view><view class="field"><text>瀹炲彂宸ヨ祫</text><text>{{money(editing.actualSalary)}}</text></view><view class="toolbar"><button @click="editing=undefined">鍙栨秷</button><button @click="saveEdit">淇濆瓨</button></view></view></view></template><style scoped lang="scss">@import "../list.scss";.top-actions{display:flex;justify-content:flex-end;margin-bottom:18rpx}.top-actions button{margin:0;color:var(--color-primary, #1769d8);font-size:24rpx;background:#fff}.panel{position:fixed;z-index:20;inset:0;padding:10vh 30rpx;background:rgba(20,30,45,.48)}.panel .form-card{max-height:78vh;overflow:auto}.field{display:flex;align-items:center;min-height:88rpx;padding:0 24rpx;border-bottom:1rpx solid #eef1f5}.field text:first-child{width:220rpx}.field input{flex:1;text-align:right}.toolbar{display:flex;gap:16rpx;padding:20rpx}.toolbar button{flex:1}</style>
diff --git a/src/pages/hrm/social-security-scheme/index.vue b/src/pages/hrm/social-security-scheme/index.vue
index ed28187..5ffe9ea 100644
--- a/src/pages/hrm/social-security-scheme/index.vue
+++ b/src/pages/hrm/social-security-scheme/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import HrmCrudPage, { type CrudConfig } from "../components/HrmCrudPage.vue";
 import { createSocialSecurityScheme, deleteSocialSecurityScheme, getSocialSecuritySchemeList, updateSocialSecurityScheme } from "../../../api/hrm";
-const ratios=["pensionCompanyRatio","pensionPersonalRatio","medicalCompanyRatio","medicalPersonalRatio","unemploymentCompanyRatio","unemploymentPersonalRatio","workInjuryRatio","maternityRatio","housingFundCompanyRatio","housingFundPersonalRatio"];
-const labels=["鍏昏�佸崟浣嶆瘮渚�","鍏昏�佷釜浜烘瘮渚�","鍖荤枟鍗曚綅姣斾緥","鍖荤枟涓汉姣斾緥","澶变笟鍗曚綅姣斾緥","澶变笟涓汉姣斾緥","宸ヤ激姣斾緥","鐢熻偛姣斾緥","鍏Н閲戝崟浣嶆瘮渚�","鍏Н閲戜釜浜烘瘮渚�"];
+const ratios=["pensionCompanyRatio","pensionPersonalRatio","medicalCompanyRatio","medicalPersonalRatio","unemploymentCompanyRatio","unemploymentPersonalRatio","workInjuryRatio","maternityRatio","seriousIllnessCompanyRatio","seriousIllnessPersonalRatio","longTermCareCompanyRatio","longTermCarePersonalRatio","housingFundCompanyRatio","housingFundPersonalRatio"];
+const labels=["鍏昏�佸崟浣嶆瘮渚�","鍏昏�佷釜浜烘瘮渚�","鍖荤枟鍗曚綅姣斾緥","鍖荤枟涓汉姣斾緥","澶变笟鍗曚綅姣斾緥","澶变笟涓汉姣斾緥","宸ヤ激姣斾緥","鐢熻偛姣斾緥","澶х梾鍖荤枟鍗曚綅姣斾緥","澶х梾鍖荤枟涓汉姣斾緥","闀挎湡鎶ょ悊鍗曚綅姣斾緥","闀挎湡鎶ょ悊涓汉姣斾緥","鍏Н閲戝崟浣嶆瘮渚�","鍏Н閲戜釜浜烘瘮渚�"];
 const config: CrudConfig = { title:"绀句繚鍏Н閲戞柟妗�", permission:"hrm:social-security-scheme", fields:[{key:"name",label:"鏂规鍚嶇О",required:true},{key:"effectiveDate",label:"鐢熸晥鏃ユ湡",required:true},...ratios.map((key,i)=>({key,label:labels[i],type:"number" as const,required:true})),{key:"remark",label:"澶囨敞"}], cardFields:[{key:"name",label:"鍚嶇О"},{key:"effectiveDate",label:"鐢熸晥鏃ユ湡"},{key:"pensionCompanyRatio",label:"鍏昏�佸崟浣嶆瘮渚�"},{key:"housingFundCompanyRatio",label:"鍏Н閲戝崟浣嶆瘮渚�"}], load:(t,k)=>getSocialSecuritySchemeList(t,{name:k||undefined}), create:createSocialSecurityScheme, update:updateSocialSecurityScheme, remove:deleteSocialSecurityScheme };
 </script><template><HrmCrudPage :config="config" /></template>
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