From 2b8c32366a2916dfbeac269eea94b2e6ef65f556 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期二, 20 一月 2026 14:40:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/personnelManagement/selfService/index.vue | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/views/personnelManagement/selfService/index.vue b/src/views/personnelManagement/selfService/index.vue
index ca683c0..647f149 100644
--- a/src/views/personnelManagement/selfService/index.vue
+++ b/src/views/personnelManagement/selfService/index.vue
@@ -221,8 +221,7 @@
const { proxy } = getCurrentInstance()
import { getUserProfile } from '@/api/system/user.js'
-import {staffJoinUpdate, staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
-import { fa, id } from 'element-plus/es/locales.mjs'
+import {staffOnJobListPage, updateStaffOnJob} from "@/api/personnelManagement/staffOnJob.js";
const tableLoading = ref(false)
// 鍒嗛〉鍙傛暟
@@ -572,7 +571,7 @@
currentUser.value = res.data
// console.log("----",currentUser.value)
//寰楀埌浜哄憳鍒楄〃
- staffJoinListPage({staffState: 1}).then(res => {
+ staffOnJobListPage({staffState: 1}).then(res => {
//绛涢�夊嚭鍜宑urrentUser鍚屽悕鐨勪汉鍛�
// let tableData = res.data.records
user.value = res.data.records.find(item => item.staffName === currentUser.value.userName)
@@ -604,18 +603,15 @@
const userRes = await getUserProfile();
if (userRes.code === 200) {
currentUser.value = userRes.data;
- const staffListRes = await staffJoinListPage({ staffState: 1 });
+ const staffListRes = await staffOnJobListPage({ staffState: 1 });
user.value = staffListRes.data.records.find(item => item.staffName === currentUser.value.userName);
- // console.log("++++", user.value);
-
Object.assign(joinForm, user.value);
joinForm.staffName = profileForm.name;
joinForm.phone = profileForm.phone;
joinForm.email = profileForm.email;
joinForm.adress = profileForm.adress;
- console.log(joinForm)
// 璋冪敤鏇存柊涓汉淇℃伅鐨勬帴鍙�
- staffJoinUpdate(joinForm).then(res => {
+ updateStaffOnJob(user.value.id, joinForm).then(res => {
if (res.code === 200) {
ElMessage.success('涓汉淇℃伅淇濆瓨鎴愬姛');
getProfile();
--
Gitblit v1.9.3