From 9cb647d53edec8cd31df68c317d2b1d531ccda36 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 17 Apr 2024 16:59:33 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E5=A2=9E=E5=8A=A0=20=E6=89=80=E5=B1=9E?=
=?UTF-8?q?=E6=9C=BA=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/tenant/talents.js | 142 +++++++++---------
src/router/router.js | 1 +
src/views/system/user.vue | 27 ++--
.../talents/certain/Dialog/transferGroups.vue | 52 ++++++-
.../tenant/main/talents/certain/index.vue | 128 ++++++++++------
.../talents/latent/Dialog/transferGroups.vue | 54 ++++++-
.../tenant/main/talents/latent/index.vue | 124 ++++++++++-----
vue.config.js | 4 +-
8 files changed, 353 insertions(+), 179 deletions(-)
diff --git a/src/api/tenant/talents.js b/src/api/tenant/talents.js
index a9317dc..8ec950f 100644
--- a/src/api/tenant/talents.js
+++ b/src/api/tenant/talents.js
@@ -1,106 +1,114 @@
import request from '@/router/axios';
/*获取人才列表*/
export const getList =
- (current, size, params, groupId) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/list',
- method: 'get',
- params: {...params, current, size, groupId}
- })
- }
+ (current, size, params, groupId) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/list',
+ method: 'get',
+ params: {...params, current, size, groupId}
+ })
+ }
/*新增人才*/
export const add =
- (row) => {
- return request(
- {url: '/api/jobslink-api/tenant/talents/save', method: 'post', data: row})
- }
+ (row) => {
+ return request(
+ {url: '/api/jobslink-api/tenant/talents/save', method: 'post', data: row})
+ }
/*编辑人才*/
export const update =
- (row) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/tenant/update',
- method: 'post',
- data: row
- })
- }
+ (row) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/tenant/update',
+ method: 'post',
+ data: row
+ })
+ }
/*删除人才*/
export const remove =
- (ids) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/remove',
- method: 'post',
- params: {ids}
- })
- }
+ (ids) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/remove',
+ method: 'post',
+ params: {ids}
+ })
+ }
/*人才详情*/
export const detail =
- (id) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/detail',
- method: 'get',
- params: {id}
- })
- }
+ (id) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/detail',
+ method: 'get',
+ params: {id}
+ })
+ }
/*获取分组*/
export const getDept =
- (params = {}) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/group/listAll',
- method: 'get',
- params
- })
- }
+ (params = {}) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/group/listAll',
+ method: 'get',
+ params
+ })
+ }
/*新建分组*/
export const addDept =
- (row) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/group/save',
- method: 'post',
- data: row
- })
- }
+ (row) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/group/save',
+ method: 'post',
+ data: row
+ })
+ }
/*编辑分组*/
export const updateDept =
- (row) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/group/update',
- method: 'post',
- data: row
- })
- }
+ (row) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/group/update',
+ method: 'post',
+ data: row
+ })
+ }
/*删除分组*/
export const removeDept =
- (ids) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/group/remove',
- method: 'post',
- params: {ids}
- })
- }
+ (ids) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/group/remove',
+ method: 'post',
+ params: {ids}
+ })
+ }
/*转移分组*/
export const transferDept =
- (groupIds, ids) => {
- return request({
- url: '/api/jobslink-api/tenant/talents/updateAllGroup',
- method: 'post',
- params: {groupIds, ids}
- })
- }
+ (groupIds, ids, deptId) => {
+ return request({
+ url: '/api/jobslink-api/tenant/talents/updateAllGroup',
+ method: 'post',
+ params: {groupIds, ids, deptId}
+ })
+ }
/*导入人才库*/
export const upload = () => {
return `/api/jobslink-api/tenant/talents/tenant/import-talents?isCovered=1`
}
+
+export const getDeptMyTree = (params) => {
+ return request({
+ url: '/api/jobslink-api/system/dept/my-tree',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/router/router.js b/src/router/router.js
index 38e7e23..2c7a950 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -18,6 +18,7 @@ Vue.use(VueRouter);
export const createRouter = () =>
new VueRouter({
// mode: 'history',
+ // base: 'manage',
// https://router.vquejs.org/zh/guide/advanced/scroll-behavior.html#%E5%BC%82%E6%AD%A5%E6%BB%9A%E5%8A%A8
// 这个方法 是控制滚动条
// 如果 retuen falsy || {} ,则不发生滚动
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index ca88d5c..123d086 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -31,13 +31,15 @@
size="small"
icon="el-icon-search"
@click="searchChange1"
- >搜 索搜 索
+
清 空清 空
+
@@ -72,7 +74,8 @@
v-if="permission.user_role"
icon="el-icon-user"
@click="handleGrant"
- >角色配置角色配置
+
密码重置密码重置
+
@@ -148,14 +152,14 @@ import {
grant,
resetPassword,
} from "@/api/system/user";
-import { getDeptTree } from "@/api/system/dept";
-import { getRoleTree } from "@/api/system/role";
-import { mapGetters } from "vuex";
+import {getDeptTree} from "@/api/system/dept";
+import {getRoleTree} from "@/api/system/role";
+import {mapGetters} from "vuex";
import website from "@/config/website";
-import { getToken } from "@/util/auth";
-import { isMobile } from "@/util/validate";
+import {getToken} from "@/util/auth";
+import {isMobile} from "@/util/validate";
import md5 from "js-md5";
-import { excelAccept } from "@/common/accept";
+import {excelAccept} from "@/common/accept";
export default {
name: "user",
@@ -456,7 +460,7 @@ export default {
"excelForm.isCovered"() {
if (this.excelForm.isCovered !== "") {
const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/jobslink-api/system/tuser//import-user?isCovered=${this.excelForm.isCovered}`;
+ column.action = `/api/jobslink-api/system/tuser/import-user?isCovered=${this.excelForm.isCovered}`;
}
},
},
@@ -722,6 +726,7 @@ export default {
margin-bottom: 18px;
padding: 0 10px;
}
+
.searchBtn {
display: inline-block;
margin-bottom: 18px;
diff --git a/src/views/tenant/main/talents/certain/Dialog/transferGroups.vue b/src/views/tenant/main/talents/certain/Dialog/transferGroups.vue
index 4c96bec..7b499b0 100644
--- a/src/views/tenant/main/talents/certain/Dialog/transferGroups.vue
+++ b/src/views/tenant/main/talents/certain/Dialog/transferGroups.vue
@@ -19,7 +19,8 @@