From f843875db4c031b977c37ab5eaf389f8fcdfeb83 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 30 Mar 2019 23:57:48 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/website.js        |  3 ++-
 src/page/login/userlogin.vue |  4 +++-
 src/views/system/dept.vue    |  5 ++++-
 src/views/system/role.vue    | 27 ++++++++++++++++++++++++++-
 src/views/system/user.vue    | 13 ++++++++++---
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/config/website.js b/src/config/website.js
index 5817e31..00a7bc0 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -3,9 +3,10 @@
  */
 export default {
   title: "saber",
+  indexTitle: 'Saber Admin',
+  tenantMode: true, // 是否开启租户模式
   logo: "S",
   key: 'saber',//配置主键,目前用于存储
-  indexTitle: 'Saber Admin',
   lockPage: '/lock',
   tokenTime: 6000,
   //http的status默认放行不才用统一处理的,
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 15d7015..b90b78b 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -5,7 +5,7 @@
            ref="loginForm"
            :model="loginForm"
            label-width="0">
-    <el-form-item prop="tenantCode">
+    <el-form-item v-if="tenantMode" prop="tenantCode">
       <el-input size="small"
                 @keyup.enter.native="handleLogin"
                 v-model="loginForm.tenantCode"
@@ -50,10 +50,12 @@
 
 <script>
 import { mapGetters } from "vuex";
+import website from '@/config/website';
 export default {
   name: "userlogin",
   data() {
     return {
+      tenantMode: website.tenantMode,
       loginForm: {
         tenantCode: "000000",
         username: "admin",
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 14065fd..3b3c939 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -44,6 +44,7 @@
     getDeptTree
   } from "@/api/system/dept";
   import {mapGetters} from "vuex";
+  import website from '@/config/website';
 
   export default {
     data() {
@@ -76,9 +77,11 @@
             {
               label: "租户编号",
               prop: "tenantCode",
-              search: true,
+              search: website.tenantMode,
+              hide: !website.tenantMode,
               addDisplay: false,
               editDisplay: false,
+              viewDisplay: website.tenantMode,
               rules: [{
                 required: true,
                 message: "请输入租户编号",
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index dac13f6..4638dd3 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -67,6 +67,7 @@ import {
   getRoleTree
 } from "@/api/system/role";
 import { mapGetters } from "vuex";
+import website from '@/config/website';
 
 export default {
   data() {
@@ -92,6 +93,8 @@ export default {
         index: true,
         selection: true,
         viewBtn: true,
+        dialogWidth: 300,
+        dialogHeight: 400,
         column: [
           {
             label: "角色名称",
@@ -109,9 +112,10 @@ export default {
           {
             label: "租户编号",
             prop: "tenantCode",
-            search: true,
             addDisplay: false,
             editDisplay: false,
+            viewDisplay: website.tenantMode,
+            hide: !website.tenantMode,
             span: 24,
             rules: [{
               required: true,
@@ -119,6 +123,27 @@ export default {
               trigger: "blur"
             }]
           },
+          {
+            label: "所属租户",
+            prop: "tenantCode",
+            type: "tree",
+            dicUrl: "/api/blade-system/tenant/select",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: website.tenantMode,
+            span: 24,
+            props: {
+              label: "tenantName",
+              value: "tenantCode"
+            },
+            hide: !website.tenantMode,
+            search: website.tenantMode,
+            rules: [{
+              required: true,
+              message: "请输入所属租户",
+              trigger: "click"
+            }]
+          },
           {
             label: "角色别名",
             prop: "roleAlias",
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index c98a88d..5492bbe 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -54,6 +54,7 @@
   import {getDeptTree} from "@/api/system/dept";
   import {getRoleTree} from "@/api/system/role";
   import {mapGetters} from "vuex";
+  import website from '@/config/website';
 
   export default {
     data() {
@@ -102,11 +103,13 @@
                 required: true,
                 message: "请输入登录账号",
                 trigger: "blur"
-              }]
+              }],
+              span: website.tenantMode ? 12 : 24,
             },
             {
               label: "租户编号",
               prop: "tenantCode",
+              hide: !website.tenantMode,
               addDisplay: false,
               editDisplay: false,
               viewDisplay: false,
@@ -120,7 +123,11 @@
                 label: "tenantName",
                 value: "tenantCode"
               },
-              search: true,
+              hide: !website.tenantMode,
+              addDisplay: website.tenantMode,
+              editDisplay: website.tenantMode,
+              viewDisplay: website.tenantMode,
+              search: website.tenantMode,
               rules: [{
                 required: true,
                 message: "请输入所属租户",
@@ -274,7 +281,7 @@
           ids.push(ele.id);
         });
         return ids.join(",");
-      }
+      },
     },
     methods: {
       rowSave(row, loading) {