From 858b8c12e7d0fab3ee907cede2fe90d6d2a9cfe8 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 24 Aug 2021 18:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/RoleUserList.vue      | 26 ++++++++++++++++++++++++--
 src/views/system/modules/RoleModal.vue | 18 ++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index a4a5366..d947b22 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -22,6 +22,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="margin: 5px 0 10px 2px">
       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:role:add'">添加角色</a-button>
+      <a-button @click="handleAddLowerLevel" type="primary" icon="plus" >添加下级</a-button>
       <a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
     </div>
     <div style="margin-top: 15px">
@@ -64,6 +65,7 @@ import UserRoleModal from "./modules/UserRoleModal";
 import JEllipsis from "@comp/jero/JEllipsis";
 import moment from "moment";
 
+
 export default {
   name: "RoleUserList",
   mixins: [JeroListMixin],
@@ -94,6 +96,11 @@ export default {
             dataIndex: "roleName",
             scopedSlots: {customRender: 'text'}
           },
+          {
+            title: "上级角色",
+            align: "center",
+            dataIndex: "",
+          },
           {
             title: "创建时间",
             dataIndex: "createTime",
@@ -112,7 +119,7 @@ export default {
           }
         ],
       url: {
-        list: "/sys/role/page",
+        // list: "/sys/role/page",
         delete: "/sys/role/delete",
         deleteBatch: "/sys/role/deleteBatch",
         list2: "/sys/user/userRoleList",
@@ -151,7 +158,22 @@ export default {
         }
       });
     },
-
+    /*
+    * 添加下级
+    * */
+    handleAddLowerLevel(){
+      if(this.selectedRowKeys.length === 0){
+        this.$message.warning('请选择一条记录')
+        return
+      }
+      if(this.selectedRowKeys.length > 1){
+        this.$message.warning('只能选择一条记录')
+        return
+      }
+      // 将这行的角色id作为新建角色的的父级id
+      this.$refs.modalForm.addLowerRole(this.selectedRowKeys[0]);
+      this.$refs.modalForm.title='添加下级'
+    },
     handleAddUserRole() {
       if (this.currentRoleId == "") {
         this.$message.error("请选择一个角色!");
diff --git a/src/views/system/modules/RoleModal.vue b/src/views/system/modules/RoleModal.vue
index c661761..4bc99a0 100644
--- a/src/views/system/modules/RoleModal.vue
+++ b/src/views/system/modules/RoleModal.vue
@@ -27,6 +27,13 @@
           <a-input placeholder="请输入角色编码" @change="event => event.target.value = event.target.value.trim()" :maxLength="64" :disabled="roleDisabled" v-decorator="[ 'roleCode', validatorRules.roleCode]" />
         </a-form-item>
 
+        <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="上级角色">
+          <a-input placeholder="请选择上级角色" @change="event => event.target.value = event.target.value.trim()" :maxLength="64" :disabled="roleDisabled" v-decorator="[ 'roleParentId', validatorRules.roleParentId]" />
+        </a-form-item>
+
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -95,6 +102,7 @@
         this.edit({});
       },
       edit (record) {
+        debugger
         this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
@@ -110,6 +118,16 @@
         });
 
       },
+      /*
+      *  添加下级
+      * */
+      addLowerRole(parentId){
+        this.form.resetFields();
+        this.visible = true;
+        this.$nextTick( () => {
+          this.form.setFieldsValue({roleParentId:parentId})
+        })
+      },
       close () {
         this.$emit('close');
         this.visible = false;