no message

This commit is contained in:
kuaifan 2021-06-29 16:46:43 +08:00
parent c1c6837d76
commit 27789b8eb9
6 changed files with 83 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.2.13",
"version": "0.2.19",
"description": "DooTask is task management system.",
"scripts": {
"dev": "npm run development",

View File

@ -133,7 +133,7 @@
<!--查看归档项目-->
<Drawer
v-model="archivedProjectShow"
:width="680"
:width="900"
:title="$L('归档的项目')">
<ProjectArchived v-if="archivedProjectShow"/>
</Drawer>

View File

@ -1,5 +1,20 @@
<template>
<div class="project-archived">
<div class="search-box auto">
<ul>
<li>
<div class="search-label">
{{$L("项目名")}}
</div>
<div class="search-content">
<Input v-model="keys.name" clearable/>
</div>
</li>
<li class="search-button">
<Button :loading="loadIng > 0" type="primary" icon="ios-search" @click="getLists">{{$L('搜索')}}</Button>
</li>
</ul>
</div>
<Table :columns="columns" :data="list" :no-data-text="$L(noText)"></Table>
<Page
class="page-box"
@ -19,6 +34,8 @@ export default {
return {
loadIng: 0,
keys: {},
columns: [],
list: [],
@ -34,6 +51,10 @@ export default {
methods: {
initLanguage() {
this.columns = [
{
title: this.$L('ID'),
key: 'id',
},
{
title: this.$L('项目名称'),
key: 'name',
@ -50,7 +71,7 @@ export default {
{
title: this.$L('归档会员'),
key: 'archived_userid',
minWidth: 100,
minWidth: 80,
render: (h, {row}) => {
return h('UserAvatar', {
props: {
@ -61,6 +82,19 @@ export default {
});
}
},
{
title: this.$L('负责人'),
minWidth: 80,
render: (h, {row}) => {
return h('UserAvatar', {
props: {
showName: true,
size: 22,
userid: row.owner_userid,
}
})
}
},
{
title: this.$L('操作'),
align: 'center',
@ -83,7 +117,17 @@ export default {
this.recovery(params.row);
}
},
}, this.$L('还原'));
}, [
h('Button', {
props: {
type: 'primary',
size: 'small'
},
style: {
fontSize: '12px',
},
}, this.$L('还原')),
]);
return h('TableAction', {
props: {
column: params.column

View File

@ -1,6 +1,6 @@
<template>
<div class="project-management">
<div class="search-box" style="display:inline-block">
<div class="search-box auto">
<ul>
<li>
<div class="search-label">
@ -10,6 +10,18 @@
<Input v-model="keys.name" clearable/>
</div>
</li>
<li>
<div class="search-label">
{{$L("项目状态")}}
</div>
<div class="search-content">
<Select v-model="keys.status">
<Option value="">{{$L('全部')}}</Option>
<Option value="unarchived">{{$L('未归档')}}</Option>
<Option value="archived">{{$L('已归档')}}</Option>
</Select>
</div>
</li>
<li class="search-button">
<Button :loading="loadIng > 0" type="primary" icon="ios-search" @click="getLists">{{$L('搜索')}}</Button>
</li>
@ -125,13 +137,19 @@ export default {
]
},
getLists() {
let archived = 'all';
if (this.keys.status == 'archived') {
archived = 'yes';
} else if (this.keys.status == 'unarchived') {
archived = 'no';
}
this.loadIng++;
this.$store.dispatch("call", {
url: 'project/lists',
data: {
keys: this.keys,
all: 1,
archived: 'all',
archived,
page: Math.max(this.page, 1),
pagesize: Math.max($A.runNum(this.pageSize), 20),
},

View File

@ -300,6 +300,14 @@ body {
}
}
}
&.auto {
display: flex;
> ul {
> li:not(.search-button) {
min-width: 180px;
}
}
}
}
.icon-loading {

View File

@ -644,6 +644,13 @@
white-space: nowrap;
}
}
&.row-priority {
.el-dropdown {
display: flex;
align-items: center;
overflow: hidden;
}
}
&.row-user {
padding: 8px;
> ul {