From 654aa6b30ccd30ef1efc0d083a2f48a8d8287a4e Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 6 Jan 2021 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=8F=B3=E4=BE=A7=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E6=98=BE?= =?UTF-8?q?=E9=9A=90=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/FileUpload/index.vue | 1 + .../src/components/RightToolbar/index.vue | 50 +++++++++++++++++-- ruoyi-ui/src/layout/components/global.js | 3 -- ruoyi-ui/src/views/system/user/index.vue | 26 +++++++--- 4 files changed, 65 insertions(+), 15 deletions(-) delete mode 100644 ruoyi-ui/src/layout/components/global.js diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue index 841d3ae65..d19a01225 100644 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ b/ruoyi-ui/src/components/FileUpload/index.vue @@ -90,6 +90,7 @@ export default { return item; }); } else { + this.fileList = []; return []; } }, diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue index 73d2dccea..9bf972277 100644 --- a/ruoyi-ui/src/components/RightToolbar/index.vue +++ b/ruoyi-ui/src/components/RightToolbar/index.vue @@ -1,4 +1,3 @@ - + diff --git a/ruoyi-ui/src/layout/components/global.js b/ruoyi-ui/src/layout/components/global.js deleted file mode 100644 index 5d2b5b3e8..000000000 --- a/ruoyi-ui/src/layout/components/global.js +++ /dev/null @@ -1,3 +0,0 @@ -import Vue from 'vue' -const global = new Vue() -export default global diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 5399b34a2..078f840e6 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -135,17 +135,17 @@ v-hasPermi="['system:user:export']" >导出 - + - - - - - - + + + + + + - + @@ -418,6 +418,16 @@ export default { status: undefined, deptId: undefined }, + // 列信息 + columns: [ + { key: 0, label: `用户编号`, visible: true }, + { key: 1, label: `用户名称`, visible: true }, + { key: 2, label: `用户昵称`, visible: true }, + { key: 3, label: `部门`, visible: true }, + { key: 4, label: `手机号码`, visible: true }, + { key: 5, label: `状态`, visible: true }, + { key: 6, label: `创建时间`, visible: true } + ], // 表单校验 rules: { userName: [