From 8aa3edd56c279100c9053576f3e90fa55459fe77 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 16 Jan 2023 16:15:55 +0800
Subject: [PATCH] 修改

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

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0e50af3..cf83beb 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -90,6 +90,13 @@
                     slot="userTypeName">
             <el-tag>{{row.userTypeName}}</el-tag>
           </template>
+          <template slot-scope="{ row }" slot="online_status">
+            <el-tag
+            >{{
+              row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
+              }}
+            </el-tag>
+          </template>
         </avue-crud>
         <el-dialog title="用户角色配置"
                    append-to-body
@@ -197,7 +204,7 @@
       };
       return {
         form: {},
-        search:{},
+        search: {},
         roleBox: false,
         excelBox: false,
         platformBox: false,
@@ -254,7 +261,7 @@
         },
         option: {
           height: 'auto',
-          calcHeight: 80,
+          calcHeight: 54,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -272,10 +279,11 @@
               display: false
             },
             {
-              label: "所属租户",
+              label: "所属客户",
               prop: "tenantName",
               slot: true,
-              display: false
+              display: false,
+              width:200
             },
             {
               label: "用户姓名",
@@ -293,12 +301,26 @@
               label: "所属部门",
               prop: "deptName",
               slot: true,
-              display: false
+              display: false,
+              width:260
             },
+
             {
               label: "用户平台",
               prop: "userTypeName",
               slot: true,
+              display: false
+            }, {
+              label: "在线状态",
+              prop: "online_status",
+              slot: true,
+              display: false
+            },
+            {
+              label: "工作状态",
+              prop: "work_status",
+              slot: true,
+              hide: true,
               display: false
             },
             {
@@ -328,7 +350,7 @@
               icon: 'el-icon-user-solid',
               column: [
                 {
-                  label: "所属租户",
+                  label: "所属客户",
                   prop: "tenantId",
                   type: "tree",
                   dicUrl: "/api/blade-system/tenant/select",
@@ -495,8 +517,8 @@
                 {
                   label: "所属部门",
                   prop: "deptId",
-                  type: "tree",
-                  multiple: true,
+                  type: "cascader",
+                  //multiple: true,
                   dicData: [],
                   props: {
                     label: "title"
@@ -519,11 +541,7 @@
                     label: "postName",
                     value: "id"
                   },
-                  rules: [{
-                    required: true,
-                    message: "请选择所属岗位",
-                    trigger: "click"
-                  }],
+
                 },
               ]
             },
@@ -864,7 +882,6 @@
         this.excelBox = true;
       },
       uploadAfter(res, done, loading, column) {
-        window.console.log(column);
         this.excelBox = false;
         this.refreshChange();
         done();
@@ -885,13 +902,13 @@
         if (["edit", "view"].includes(type)) {
           getUser(this.form.id).then(res => {
             this.form = res.data.data;
-            if(this.form.hasOwnProperty("deptId")){
+            if (this.form.hasOwnProperty("deptId")) {
               this.form.deptId = this.form.deptId.split(",");
             }
-            if(this.form.hasOwnProperty("roleId")){
+            if (this.form.hasOwnProperty("roleId")) {
               this.form.roleId = this.form.roleId.split(",");
             }
-            if(this.form.hasOwnProperty("postId")){
+            if (this.form.hasOwnProperty("postId")) {
               this.form.postId = this.form.postId.split(",");
             }
           });

--
Gitblit v1.9.3