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/collaborativeApproval/enterpriseBook/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/collaborativeApproval/enterpriseBook/index.vue b/src/views/collaborativeApproval/enterpriseBook/index.vue
index 0b33a32..fa9fa5c 100644
--- a/src/views/collaborativeApproval/enterpriseBook/index.vue
+++ b/src/views/collaborativeApproval/enterpriseBook/index.vue
@@ -295,7 +295,6 @@
getEmployeeDetail
} from '@/api/collaborativeApproval/enterpriseBook.js'
import { getUserProfile } from '@/api/system/user.js'
-import {staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
import {
changeUserStatus,
listUser,
@@ -306,6 +305,7 @@
addUser,
deptTreeSelect,
} from "@/api/system/user";
+import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
// 鏍囩椤电姸鎬�
const activeTab = ref('personal')
@@ -395,7 +395,7 @@
}
//鑾峰彇鍛樺伐鍒楄〃
const getEmployeeList = async () => {
- staffJoinListPage(publicSearch.value).then(res => {
+ staffOnJobListPage(Object.assign({current: -1, size: -1},publicSearch.value)).then(res => {
console.log(res.data.records)
EmployeeList.value = res.data.records
}).catch(err => {})
@@ -403,7 +403,7 @@
// 鑾峰彇鍗曚綅閫氳褰曞垪琛�
const getCompanyContactsList = async () => {
loading.value = true
- staffJoinListPage(companySearch.value).then(res => {
+ staffOnJobListPage(Object.assign({current: -1, size: -1},companySearch.value)).then(res => {
// console.log(res.data.records)
companyContacts.value = res.data.records
}).catch(err => {})
--
Gitblit v1.9.3