From 7b7d08db01502ed44308cf0cffef08b48f3cb686 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Fri, 8 Mar 2019 22:48:40 +0800
Subject: [PATCH] =?UTF-8?q?:ok=5Fhand:=20=E5=AE=89=E6=8E=92=E5=A4=9A?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role.vue | 27 ++++++++++++++++++++++++++-
 src/views/system/user.vue |  7 +++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 2a04087..b5b0c6d 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -92,11 +92,14 @@ export default {
         index: true,
         selection: true,
         viewBtn: true,
+        dialogWidth: 300,
+        dialogHeight: 400,
         column: [
           {
             label: "角色名称",
             prop: "roleName",
             search: true,
+            span: 24,
             rules: [
               {
                 required: true,
@@ -108,19 +111,39 @@ export default {
           {
             label: "租户编号",
             prop: "tenantCode",
-            search: true,
             addDisplay: false,
             editDisplay: false,
+            span: 24,
             rules: [{
               required: true,
               message: "请输入租户编号",
               trigger: "blur"
             }]
           },
+          {
+            label: "所属租户",
+            prop: "tenantCode",
+            type: "tree",
+            dicUrl: "/api/blade-system/tenant/select",
+            addDisplay: false,
+            editDisplay: false,
+            span: 24,
+            props: {
+              label: "tenantName",
+              value: "tenantCode"
+            },
+            search: true,
+            rules: [{
+              required: true,
+              message: "请输入所属租户",
+              trigger: "click"
+            }]
+          },
           {
             label: "角色别名",
             prop: "roleAlias",
             search: true,
+            span: 24,
             rules: [
               {
                 required: true,
@@ -135,6 +158,7 @@ export default {
             dicData: [],
             type: "tree",
             hide: true,
+            span: 24,
             props: {
               label: "title"
             },
@@ -150,6 +174,7 @@ export default {
             label: "角色排序",
             prop: "sort",
             type: "number",
+            span: 24,
             rules: [
               {
                 required: true,
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 651c559..c98a88d 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -104,6 +104,13 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "租户编号",
+              prop: "tenantCode",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+            },
             {
               label: "所属租户",
               prop: "tenantCode",