From a209b39552d0a360bd5b29af6b6cb58265f9669b Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期四, 10 六月 2021 22:29:13 +0800 Subject: [PATCH] 分页组件新增pagerCount属性 --- ruoyi-ui/src/views/system/role/index.vue | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 6e96faa..8f0d433 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -94,6 +94,7 @@ plain icon="el-icon-download" size="mini" + :loading="exportLoading" @click="handleExport" v-hasPermi="['system:role:export']" >导出</el-button> @@ -213,7 +214,7 @@ <el-input v-model="form.roleKey" :disabled="true" /> </el-form-item> <el-form-item label="权限范围"> - <el-select v-model="form.dataScope"> + <el-select v-model="form.dataScope" @change="dataScopeSelectChange"> <el-option v-for="item in dataScopeOptions" :key="item.value" @@ -258,6 +259,8 @@ return { // 遮罩层 loading: true, + // 导出遮罩层 + exportLoading: false, // 选中数组 ids: [], // 非单个禁用 @@ -524,6 +527,12 @@ this.title = "修改角色"; }); }, + /** 选择角色权限范围触发 */ + dataScopeSelectChange(value) { + if(value !== '2') { + this.$refs.dept.setCheckedKeys([]); + } + }, /** 分配数据权限操作 */ handleDataScope(row) { this.reset(); @@ -584,7 +593,7 @@ }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }) + }).catch(() => {}); }, /** 导出按钮操作 */ handleExport() { @@ -593,11 +602,13 @@ confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" - }).then(function() { + }).then(() => { + this.exportLoading = true; return exportRole(queryParams); }).then(response => { this.download(response.msg); - }) + this.exportLoading = false; + }).catch(() => {}); } } }; -- Gitblit v1.9.2