github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-11 18:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 团队管理选择离职时根据离职时间排序

Browse Source
This commit is contained in:
kuaifan 2024-05-31 13:44:51 +08:00
parent afcbd6af92
commit bb163605af
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/UsersController.php
View File

@ -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');

29
resources/assets/js/pages/manage/components/TeamManagement.vue
View File

@ -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, {