From 5795958a18f16698066a1326e32d27f38cd48cd5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 25 五月 2021 10:14:18 +0800
Subject: [PATCH] update 同步升级 ruoyi-vue 3.5.0
---
ruoyi-ui/src/views/system/role/index.vue | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 68a199b..fdcfbf0 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: [],
// 闈炲崟涓鐢�
@@ -390,14 +393,14 @@
/** 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戠粨鏋� */
getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
- this.menuOptions = response.menus;
+ this.menuOptions = response.data.menus;
return response;
});
},
/** 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋� */
getRoleDeptTreeselect(roleId) {
return roleDeptTreeselect(roleId).then(response => {
- this.deptOptions = response.depts;
+ this.deptOptions = response.data.depts;
return response;
});
},
@@ -513,7 +516,7 @@
this.open = true;
this.$nextTick(() => {
roleMenu.then(res => {
- let checkedKeys = res.checkedKeys
+ let checkedKeys = res.data.checkedKeys
checkedKeys.forEach((v) => {
this.$nextTick(()=>{
this.$refs.menu.setChecked(v, true ,false);
@@ -524,6 +527,12 @@
this.title = "淇敼瑙掕壊";
});
},
+ /** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
+ dataScopeSelectChange(value) {
+ if(value !== '2') {
+ this.$refs.dept.setCheckedKeys([]);
+ }
+ },
/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
handleDataScope(row) {
this.reset();
@@ -533,7 +542,7 @@
this.openDataScope = true;
this.$nextTick(() => {
roleDeptTreeselect.then(res => {
- this.$refs.dept.setCheckedKeys(res.checkedKeys);
+ this.$refs.dept.setCheckedKeys(res.data.checkedKeys);
});
});
this.title = "鍒嗛厤鏁版嵁鏉冮檺";
@@ -593,10 +602,12 @@
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportRole(queryParams);
}).then(response => {
this.download(response.msg);
+ this.exportLoading = false;
})
}
}
--
Gitblit v1.9.3