From 22d9a2e4166c92bede4abb65d8ad6cbf99f92ef3 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 17 Oct 2024 11:15:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/userInfo.js | 38 +++-- src/main.js | 2 + src/views/components/countryMap.vue | 21 ++- src/views/process/leaveImport/index.vue | 26 ++-- src/views/process/outApply/index.vue | 3 +- src/views/process/outExam/index.vue | 2 +- src/views/process/restApply/index.vue | 3 +- src/views/process/restExam/index.vue | 3 +- src/views/system/userInfo/index.vue | 184 +++++++++++++++++------- 9 files changed, 187 insertions(+), 95 deletions(-) diff --git a/src/api/system/userInfo.js b/src/api/system/userInfo.js index d5aecb9..06e7a2a 100644 --- a/src/api/system/userInfo.js +++ b/src/api/system/userInfo.js @@ -4,18 +4,18 @@ import { parseStrEmpty } from "@/utils/bonus"; // 查询用户列表 export function listUser(query) { return request({ - url: '/system/user/getUserList', + url: '/system/user/list', method: 'get', params: query }) } // 查询用户详细 -export function getUserById(query) { +export function getUserById(data) { return request({ - url: '/system/user/getUserById', - method: 'get', - params: query + url: '/system/user/getUsersById', + method: 'post', + data: data }) } @@ -32,16 +32,34 @@ export function addUser(data) { export function updateUser(data) { return request({ url: '/system/user/updateUser', - method: 'put', + method: 'post', data: data }) } // 删除用户 -export function delUser(userId) { +export function delUser(data) { return request({ - url: '/system/user/delUser/' + userId, - method: 'delete' + url: '/system/user/delUser', + method: 'post', + data: data + }) +} +// 导出用户 +export function exportUser(data) { + return request({ + url: '/system/user/export', + method: 'post', + data: data + }) +} + + +// 角色下拉 +export function getSelectRole(query) { + return request({ + url: '/system/user/getSelectRole', + method: 'get', + params: query }) } - \ No newline at end of file diff --git a/src/main.js b/src/main.js index 4de851a..44487f2 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,7 @@ import router from './router' import directive from './directive' // directive import plugins from './plugins' // plugins import { download } from '@/utils/request' +import { downloadFile } from '@/utils/download' import './assets/icons' // icon import './permission' // permission control @@ -51,6 +52,7 @@ Vue.prototype.addDateRange = addDateRange Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download +Vue.prototype.downloadFile = downloadFile Vue.prototype.handleTree = handleTree // 全局组件挂载 diff --git a/src/views/components/countryMap.vue b/src/views/components/countryMap.vue index a746ab4..3916e8b 100644 --- a/src/views/components/countryMap.vue +++ b/src/views/components/countryMap.vue @@ -4,7 +4,7 @@
- + - - + + - -
- 确 定 - 取 消 -
- + @@ -54,7 +49,7 @@ import * as echarts from 'echarts' import mapChinaJson from '@/utils/mapJson/china.json' import { listDept } from "@/api/system/dept"; -import { getAttDayReportDetailsList } from "@/api/report/dayReport"; +import { listUser} from "@/api/system/userInfo"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { @@ -107,6 +102,7 @@ export default { , deptOptions:[], loading:false, open:false, + title:'人员信息', dialogList:[], } @@ -410,14 +406,15 @@ export default { }, openDialog(item){ this.open=true; - this.dialogQueryForm.orgId = item.orgId + this.dialogQueryForm.orgId = item.orgId; + this.title = item.orgName+'人员信息'; this.getDialogList() }, cancel(){ this.open=false; }, getDialogList() { - getAttDayReportDetailsList(this.dialogQueryForm).then(response => { + listUser(this.dialogQueryForm).then(response => { this.dialogList = response.rows; this.dialogTotal = response.total; }); diff --git a/src/views/process/leaveImport/index.vue b/src/views/process/leaveImport/index.vue index 4da7881..9f99ae2 100644 --- a/src/views/process/leaveImport/index.vue +++ b/src/views/process/leaveImport/index.vue @@ -82,15 +82,16 @@ - - + + + @@ -102,7 +103,7 @@ - + 是否更新已经存在的数据 --> 仅允许导入xls、xlsx格式文件。 - + 下载模板
@@ -172,7 +173,7 @@ \ No newline at end of file