diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index 8e3ec9aa..99e3ed2f 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -57,6 +57,9 @@
handleDelete(record.id)">
删除
+
+ 保存角色已经操作成功!现在继续分配功能吗?
+
数据类型
@@ -80,10 +83,10 @@
-
+
-
+
分配功能已经操作成功!现在继续分配按钮吗?
@@ -109,6 +112,7 @@
data () {
return {
description: '角色管理页面',
+ roleModalVisible: false,
roleFunctionModalVisible: false,
currentRoleId: '',
labelCol: {
@@ -185,21 +189,37 @@
this.$refs.rolePushBtnModal.title = "分配按钮";
this.$refs.rolePushBtnModal.disableSubmit = false;
},
+ roleModalFormOk() {
+ //重载列表
+ this.loadData()
+ this.roleModalVisible = true
+ },
roleFunctionModalFormOk(id) {
//重载列表
- this.loadData();
- this.roleFunctionModalVisible = true;
+ this.loadData()
+ this.roleFunctionModalVisible = true
this.currentRoleId = id
},
- handleTipOk() {
+ handleRoleTip(record) {
+ if(record) {
+ this.roleModalVisible = false
+ this.handleSetFunction(record)
+ }
+ },
+ handleRoleFunctionTip() {
if(this.currentRoleId) {
- this.roleFunctionModalVisible = false;
+ this.roleFunctionModalVisible = false
this.handleSetPushBtn(this.currentRoleId)
}
},
+ handleAdd: function () {
+ this.$refs.modalForm.add();
+ this.$refs.modalForm.title = "新增【保存之后请继续分配功能】";
+ this.$refs.modalForm.disableSubmit = false;
+ },
handleEdit: function (record) {
this.$refs.modalForm.edit(record);
- this.$refs.modalForm.title = "编辑";
+ this.$refs.modalForm.title = "编辑【保存之后请继续分配功能】";
this.$refs.modalForm.disableSubmit = false;
if(this.btnEnableList.indexOf(1)===-1) {
this.$refs.modalForm.isReadOnly = true