From d4480c8f312ae37b6465b4ec7347165f2cc3144a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 23 Nov 2023 23:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=86=E9=85=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/RoleList.vue | 34 +++++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

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 @@
               <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                 <a>删除</a>
               </a-popconfirm>
+              <a-modal v-model="roleModalVisible" title="操作提示" @ok="handleRoleTip(record)">
+                <p>保存角色已经操作成功！现在继续<b>分配功能</b>吗？</p>
+              </a-modal>
             </span>
             <span slot="typeTitle">
               数据类型
@@ -80,10 +83,10 @@
         </div>
         <!-- table区域-end -->
         <!-- 表单区域 -->
-        <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+        <role-modal ref="modalForm" @ok="roleModalFormOk"></role-modal>
         <role-function-modal ref="roleFunctionModal" @ok="roleFunctionModalFormOk"></role-function-modal>
         <role-push-btn-modal ref="rolePushBtnModal" @ok="modalFormOk"></role-push-btn-modal>
-        <a-modal v-model="roleFunctionModalVisible" title="操作提示" @ok="handleTipOk">
+        <a-modal v-model="roleFunctionModalVisible" title="操作提示" @ok="handleRoleFunctionTip">
           <p>分配功能已经操作成功！现在继续<b>分配按钮</b>吗？</p>
         </a-modal>
       </a-card>
@@ -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