From b508e6f20238caf6f000a2ac617bb6a4ca37d56b Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 11 Dec 2019 18:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/system/user.js | 8 ++ ruoyi-ui/src/views/system/user/index.vue | 93 ++++++++++++++++++- .../system/controller/SysUserController.java | 27 ++++++ .../ruoyi/project/system/domain/SysUser.java | 11 ++- .../system/service/ISysConfigService.java | 2 +- .../system/service/ISysUserService.java | 10 ++ .../service/impl/SysConfigServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 77 +++++++++++++++ 8 files changed, 220 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js index 45c09ebb..7f8db39e 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/ruoyi-ui/src/api/system/user.js @@ -117,3 +117,11 @@ export function uploadAvatar(data) { data: data }) } + +// 下载用户导入模板 +export function importTemplate() { + return request({ + url: '/system/user/importTemplate', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 00c36457..aae3e82b 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -112,6 +112,15 @@ v-hasPermi="['system:user:remove']" >删除 + + 导入 + 取 消 + + + + + +
+ 将文件拖到此处,或 + 点击上传 +
+
+ 是否更新已经存在的用户数据 + 下载模板 +
+
提示:仅允许导入“xls”或“xlsx”格式文件!
+
+ +