From f8e0d85bbfdfe5b57784f6f5659f6bdf1891dfa3 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 15:45:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 src/views/system/user.vue |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0c3db78..7094006 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -93,14 +93,7 @@
           <template slot-scope="{ row }" slot="online_status">
             <el-tag
             >{{
-              row.online_status == "0" ? "掉线" : row.online_status == "1" ? "在线" : "掉线"
-              }}
-            </el-tag>
-          </template>
-          <template slot-scope="{ row }" slot="work_status">
-            <el-tag
-            >{{
-              row.work_status == "0" ? "闲置" : row.work_status == "1" ? "工作中" : "闲置"
+              row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
               }}
             </el-tag>
           </template>
@@ -268,7 +261,7 @@
         },
         option: {
           height: 'auto',
-          calcHeight: 80,
+          calcHeight: 54,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -286,10 +279,11 @@
               display: false
             },
             {
-              label: "所属租户",
+              label: "所属客户",
               prop: "tenantName",
               slot: true,
-              display: false
+              display: false,
+              width:200
             },
             {
               label: "用户姓名",
@@ -307,7 +301,8 @@
               label: "所属部门",
               prop: "deptName",
               slot: true,
-              display: false
+              display: false,
+              width:260
             },
 
             {
@@ -320,10 +315,12 @@
               prop: "online_status",
               slot: true,
               display: false
-            }, {
+            },
+            {
               label: "工作状态",
               prop: "work_status",
               slot: true,
+              hide: true,
               display: false
             },
             {
@@ -353,7 +350,7 @@
               icon: 'el-icon-user-solid',
               column: [
                 {
-                  label: "所属租户",
+                  label: "所属客户",
                   prop: "tenantId",
                   type: "tree",
                   dicUrl: "/api/blade-system/tenant/select",
@@ -520,8 +517,8 @@
                 {
                   label: "所属部门",
                   prop: "deptId",
-                  type: "tree",
-                  multiple: true,
+                  type: "cascader",
+                  //multiple: true,
                   dicData: [],
                   props: {
                     label: "title"
@@ -889,7 +886,6 @@
         this.excelBox = true;
       },
       uploadAfter(res, done, loading, column) {
-        window.console.log(column);
         this.excelBox = false;
         this.refreshChange();
         done();

--
Gitblit v1.9.3