From bb163605af07d891fc4699ae16c5378b2204404e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 31 May 2024 13:44:51 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=9B=A2=E9=98=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=A6=BB=E8=81=8C=E6=97=B6=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E7=A6=BB=E8=81=8C=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php  |  1 +
 .../manage/components/TeamManagement.vue      | 29 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 09a52dd53..567d08647 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -724,6 +724,7 @@ class UsersController extends AbstractController
                 }
             }
             if ($keys['disable'] === 'yes') {
+                $builder->orderByDesc('disable_at');
                 $builder->whereNotNull('disable_at');
             } elseif ($keys['disable'] !== 'all') {
                 $builder->whereNull('disable_at');
diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue
index 011f2e673..b9917f379 100644
--- a/resources/assets/js/pages/manage/components/TeamManagement.vue
+++ b/resources/assets/js/pages/manage/components/TeamManagement.vue
@@ -318,6 +318,7 @@ export default {
 
             keys: {},
             keyIs: false,
+            keyDisable: false,
 
             columns: [
                 {
@@ -503,9 +504,34 @@ export default {
                     },
                 },
                 {
-                    title: this.$L('最后在线'),
                     key: 'line_at',
                     width: 168,
+                    renderHeader: (h) => {
+                        const arr = [];
+                        if (this.keyDisable) {
+                            arr.push(h('span', {
+                                style: {
+                                    color: '#f90'
+                                }
+                            }, this.$L('离职时间')))
+                            arr.push(h('span', '/'))
+                        }
+                        arr.push(h('span', this.$L('最后在线')))
+                        return h('div', arr)
+                    },
+                    render: (h, params) => {
+                        const {line_at, disable_at} = params.row;
+                        const arr = [];
+                        if (this.keyDisable) {
+                            arr.push(h('div', {
+                                style: {
+                                    color: '#f90'
+                                }
+                            }, disable_at || '-'))
+                        }
+                        arr.push(h('div', line_at || '-'))
+                        return h('div', arr);
+                    }
                 },
                 {
                     title: this.$L('操作'),
@@ -815,6 +841,7 @@ export default {
         getLists() {
             this.loadIng++;
             this.keyIs = $A.objImplode(this.keys) != "";
+            this.keyDisable = this.keys.disable === "yes";
             let keys = $A.cloneJSON(this.keys)
             if (this.departmentSelect > -1) {
                 keys = Object.assign(keys, {