From 2beeba8dd05e0ebaf83756bda00b62578882b15b Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 16 Sep 2020 23:53:14 +0800
Subject: [PATCH] =?UTF-8?q?:heavy=5Fplus=5Fsign:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B9=B3=E5=8F=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user.vue | 48 +++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index f06c4b7..b7313e6 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -78,6 +78,10 @@
                     slot="deptName">
             <el-tag>{{row.deptName}}</el-tag>
           </template>
+          <template slot-scope="{row}"
+                    slot="userTypeName">
+            <el-tag>{{row.userTypeName}}</el-tag>
+          </template>
         </avue-crud>
         <el-dialog title="用户角色配置"
                    append-to-body
@@ -245,6 +249,12 @@
               slot: true,
               display: false
             },
+            {
+              label: "用户平台",
+              prop: "userTypeName",
+              slot: true,
+              display: false
+            },
           ],
           group: [
             {
@@ -252,16 +262,6 @@
               prop: 'baseInfo',
               icon: 'el-icon-user-solid',
               column: [
-                {
-                  label: "登录账号",
-                  prop: "account",
-                  rules: [{
-                    required: true,
-                    message: "请输入登录账号",
-                    trigger: "blur"
-                  }],
-                  span: website.tenantMode ? 12 : 24,
-                },
                 {
                   label: "所属租户",
                   prop: "tenantId",
@@ -279,6 +279,34 @@
                     required: true,
                     message: "请输入所属租户",
                     trigger: "click"
+                  }],
+                  span: 24,
+                },
+                {
+                  label: "登录账号",
+                  prop: "account",
+                  rules: [{
+                    required: true,
+                    message: "请输入登录账号",
+                    trigger: "blur"
+                  }],
+                },
+                {
+                  label: "用户平台",
+                  type: "select",
+                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  dataType: "number",
+                  slot: true,
+                  prop: "userType",
+                  search: true,
+                  rules: [{
+                    required: true,
+                    message: "请选择用户平台",
+                    trigger: "blur"
                   }]
                 },
                 {