From 80e0b9da4d4da98452f8930b148750763d85f090 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期二, 27 九月 2022 23:12:14 +0800
Subject: [PATCH] 修改用户管理和角色管理部分问题
---
src/views/systemSetting/baseSetting/role/index.vue | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index 421728c..48e48ed 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -12,7 +12,7 @@
<div class="addUser">
<el-button class="addBtn" type="primary" @click="dialogCreate = true">鏂板缓瑙掕壊</el-button>
<el-dialog :visible.sync="dialogCreate" title="鏂板瑙掕壊" width="45%" v-if="dialogCreate">
- <createUser :refresh="getUserList" />
+ <createUser :refresh="context==='' ? getUserList : search" />
</el-dialog>
</div>
</div>
@@ -63,8 +63,8 @@
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
v-if="dialogUpdate">
- <updateUser :updateFlag="updateFlag" :userInfo=userInfo :getUserList=getUserList
- @changeDialog="changeDialog" />
+ <updateUser :updateFlag="updateFlag" :userInfo=userInfo
+ :getUserList=" context ? getUserList : getUserList" @changeDialog="changeDialog" />
</el-dialog>
<!-- 鍒嗛〉 -->
<div class="pagination">
@@ -167,37 +167,26 @@
if (res.code === 200) {
console.log(res);
res.data.list.forEach(item => {
- item.createTime = helper(item.createTime);
+ // item.createTime = helper(item.createTime);
item.status == 1 ? item.status = true : item.status = false;
})
- that.tableData = res.data.list
+ that.tableData = res.data.list;
+ this.totalNum = res.data.list.length;
}
})
} else {
this.$axios({
method: 'get',
- url: 'sccg/role/list?keyword='+context + '&pageNum=' + currentPage + '&pageSize=' + pageSize,
+ url: 'sccg/role/list?keyword=' + context + '&pageNum=' + currentPage + '&pageSize=' + pageSize,
}).then(res => {
if (res.code === 200) {
- console.log(2, res);
res.data.list.forEach(item => {
- item.createTime = helper(item.createTime);
item.status == 1 ? item.status = true : item.status = false;
})
that.tableData = res.data.list
- this.totalNum = res.data.length;
+ this.totalNum = res.data.list.length;
}
})
- // this.$axios.get('sccg/role/list?'+context).then(res => {
- // if (res.code === 200) {
- // console.log(2,res);
- // res.data.list.forEach(item => {
- // item.createTime = helper(item.createTime);
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.tableData = res.data.list
- // }
- // })
}
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
--
Gitblit v1.8.0