gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2021-06-14 01:10:49 +08:00
parent 76eac54165
commit 804211973f
4 changed files with 130 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/pages/manage.vue
View File

@ -107,7 +107,7 @@
:mask-closable="false" :mask-closable="false"
:styles="{ :styles="{
width: '90%', width: '90%',
maxWidth: projectOpenTask._dialog || projectOpenTask._msgText ? '1200px' : '640px' maxWidth: projectOpenTask.dialog_id ? '1200px' : '640px'
}" }"
footer-hide> footer-hide>
<TaskDetail :open-task="projectOpenTask"/> <TaskDetail :open-task="projectOpenTask"/>

141
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -84,7 +84,7 @@
</Poptip> </Poptip>
</li> </li>
<!--主任务--> <!--主任务-->
<div v-else v-show="taskDetail.id > 0" :class="{'task-detail':true, 'open-dialog': taskDetail._dialog || taskDetail._msgText, 'completed': taskDetail.complete_at}"> <div v-else v-show="taskDetail.id > 0" :class="{'task-detail':true, 'open-dialog': taskDetail.dialog_id, 'completed': taskDetail.complete_at}">
<div class="task-info"> <div class="task-info">
<div class="head"> <div class="head">
<Icon v-if="taskDetail.complete_at" class="icon completed" type="md-checkmark-circle" @click="updateData('uncomplete')"/> <Icon v-if="taskDetail.complete_at" class="icon completed" type="md-checkmark-circle" @click="updateData('uncomplete')"/>
@ -94,7 +94,34 @@
<p v-if="taskDetail.column_name">{{taskDetail.column_name}}</p> <p v-if="taskDetail.column_name">{{taskDetail.column_name}}</p>
<p v-if="taskDetail.id">{{taskDetail.id}}</p> <p v-if="taskDetail.id">{{taskDetail.id}}</p>
</div> </div>
<EDropdown
trigger="click"
placement="bottom"
@command="dropTask">
<Icon class="menu" type="ios-more"/> <Icon class="menu" type="ios-more"/>
<EDropdownMenu slot="dropdown">
<EDropdownItem v-if="taskDetail.complete_at" command="uncomplete">
<div class="item red">
<Icon type="md-checkmark-circle-outline" />{{$L('标记未完成')}}
</div>
</EDropdownItem>
<EDropdownItem v-else command="complete">
<div class="item">
<Icon type="md-radio-button-off" />{{$L('完成')}}
</div>
</EDropdownItem>
<EDropdownItem command="archived">
<div class="item">
<Icon type="ios-filing" />{{$L('归档')}}
</div>
</EDropdownItem>
<EDropdownItem command="delete">
<div class="item">
<Icon type="md-trash" />{{$L('删除')}}
</div>
</EDropdownItem>
</EDropdownMenu>
</EDropdown>
</div> </div>
<div class="scroller overlay-y" :style="scrollerStyle"> <div class="scroller overlay-y" :style="scrollerStyle">
<div class="title"> <div class="title">
@ -125,6 +152,7 @@
<ul class="item-content"> <ul class="item-content">
<li> <li>
<EDropdown <EDropdown
ref="priority"
trigger="click" trigger="click"
placement="bottom" placement="bottom"
@command="updateData('priority', $event)"> @command="updateData('priority', $event)">
@ -172,13 +200,13 @@
<div v-else>--</div> <div v-else>--</div>
</Poptip> </Poptip>
</FormItem> </FormItem>
<FormItem v-if="getAssist.length > 0"> <FormItem v-if="getAssist.length > 0 || assistForce">
<div class="item-label" slot="label"> <div class="item-label" slot="label">
<i class="iconfont">&#xe63f;</i>{{$L('协助人员')}} <i class="iconfont">&#xe63f;</i>{{$L('协助人员')}}
</div> </div>
<Poptip <Poptip
ref="assist" ref="assist"
:title="$L('修改协助人员')" :title="$L(getAssist.length > 0 ? '修改协助人员' : '添加协助人员')"
:width="280" :width="280"
class="item-content user" class="item-content user"
placement="bottom" placement="bottom"
@ -197,12 +225,13 @@
<Button size="small" type="primary" @click="$refs.assist.ok()">{{$L('确定')}}</Button> <Button size="small" type="primary" @click="$refs.assist.ok()">{{$L('确定')}}</Button>
</div> </div>
</div> </div>
<div class="user-list"> <div v-if="getAssist.length > 0" class="user-list">
<UserAvatar v-for="item in getAssist" :key="item.userid" :userid="item.userid" :size="28" hide-icon-menu/> <UserAvatar v-for="item in getAssist" :key="item.userid" :userid="item.userid" :size="28" hide-icon-menu/>
</div> </div>
<div v-else>--</div>
</Poptip> </Poptip>
</FormItem> </FormItem>
<FormItem v-if="taskDetail.end_at"> <FormItem v-if="taskDetail.end_at || timeForce">
<div class="item-label" slot="label"> <div class="item-label" slot="label">
<i class="iconfont">&#xe6e8;</i>{{$L('截止时间')}} <i class="iconfont">&#xe6e8;</i>{{$L('截止时间')}}
</div> </div>
@ -219,7 +248,7 @@
@on-ok="timeOk" @on-ok="timeOk"
transfer> transfer>
<div class="picker-time"> <div class="picker-time">
<div @click="openTime" class="time">{{cutTime}}</div> <div ref="time" @click="openTime" class="time">{{taskDetail.end_at ? cutTime : '--'}}</div>
<Tag v-if="!taskDetail.complete_at && taskDetail.today" color="blue"><Icon type="ios-time-outline"/>{{expiresFormat(taskDetail.end_at)}}</Tag> <Tag v-if="!taskDetail.complete_at && taskDetail.today" color="blue"><Icon type="ios-time-outline"/>{{expiresFormat(taskDetail.end_at)}}</Tag>
<Tag v-if="!taskDetail.complete_at && taskDetail.overdue" color="red">{{$L('超期未完成')}}</Tag> <Tag v-if="!taskDetail.complete_at && taskDetail.overdue" color="red">{{$L('超期未完成')}}</Tag>
</div> </div>
@ -245,11 +274,11 @@
</li> </li>
</ul> </ul>
</FormItem> </FormItem>
<FormItem v-if="hasSubtask"> <FormItem v-if="hasSubtask || addsubForce">
<div class="item-label" slot="label"> <div class="item-label" slot="label">
<i class="iconfont">&#xe6f0;</i>{{$L('子任务')}} <i class="iconfont">&#xe6f0;</i>{{$L('子任务')}}
</div> </div>
<ul class="item-content subtask"> <ul :class="['item-content subtask', taskDetail.sub_task.length === 0 ? 'nosub' : '']">
<TaskDetail v-for="(task, key) in taskDetail.sub_task" :key="key" :open-task="task"/> <TaskDetail v-for="(task, key) in taskDetail.sub_task" :key="key" :open-task="task"/>
<li> <li>
<Input <Input
@ -268,11 +297,11 @@
</ul> </ul>
</FormItem> </FormItem>
</Form> </Form>
<div class="add"> <div v-if="menuList.length > 0" class="add">
<EDropdown <EDropdown
trigger="click" trigger="click"
placement="bottom" placement="bottom"
@command=""> @command="dropAdd">
<div class="add-button"> <div class="add-button">
<i class="iconfont">&#xe6f2;</i> <i class="iconfont">&#xe6f2;</i>
{{$L('添加')}} {{$L('添加')}}
@ -342,14 +371,23 @@ export default {
ownerData: {}, ownerData: {},
ownerLoad: 0, ownerLoad: 0,
assistForce: false,
assistShow: false, assistShow: false,
assistData: {}, assistData: {},
assistLoad: 0, assistLoad: 0,
addsubForce: false,
addsubShow: false, addsubShow: false,
addsubName: "", addsubName: "",
addsubLoad: 0, addsubLoad: 0,
timeForce: false,
timeOpen: false,
timeValue: [],
timeOptions: {
shortcuts: []
},
nowTime: Math.round(new Date().getTime() / 1000), nowTime: Math.round(new Date().getTime() / 1000),
nowInterval: null, nowInterval: null,
@ -380,12 +418,6 @@ export default {
valid_elements : 'a[href|target=_blank],em,strong/b,div[align],span[style],a,br,img[src|alt|witdh|height],pre[class],code', valid_elements : 'a[href|target=_blank],em,strong/b,div[align],span[style],a,br,img[src|alt|witdh|height],pre[class],code',
toolbar: 'uploadImages | uploadFiles | bold italic underline forecolor backcolor | codesample | preview screenload' toolbar: 'uploadImages | uploadFiles | bold italic underline forecolor backcolor | codesample | preview screenload'
}, },
timeOpen: false,
timeValue: [],
timeOptions: {
shortcuts: []
},
} }
}, },
@ -410,7 +442,7 @@ export default {
if (!innerHeight) { if (!innerHeight) {
return {}; return {};
} }
if (!taskDetail._dialog) { if (!taskDetail.dialog_id) {
return {}; return {};
} }
return { return {
@ -423,7 +455,7 @@ export default {
if (!innerHeight) { if (!innerHeight) {
return {}; return {};
} }
if (taskDetail._dialog || taskDetail._msgText) { if (taskDetail.dialog_id) {
return { return {
minHeight: (innerHeight - 70 - 66 - 30) + 'px' minHeight: (innerHeight - 70 - 66 - 30) + 'px'
} }
@ -493,16 +525,9 @@ export default {
name: '优先级', name: '优先级',
}); });
} }
if (!($A.isArray(taskDetail.task_user) && taskDetail.task_user.find(({owner}) => owner === 1))) {
list.push({
command: 'owner',
icon: '&#xe6e4;',
name: '负责人',
});
}
if (!($A.isArray(taskDetail.task_user) && taskDetail.task_user.find(({owner}) => owner !== 1))) { if (!($A.isArray(taskDetail.task_user) && taskDetail.task_user.find(({owner}) => owner !== 1))) {
list.push({ list.push({
command: 'owner', command: 'assist',
icon: '&#xe63f;', icon: '&#xe63f;',
name: '协助人员', name: '协助人员',
}); });
@ -542,9 +567,14 @@ export default {
}, },
'openTask._show' (v) { 'openTask._show' (v) {
if (v) { if (v) {
this.$nextTick(this.$refs.input.focus) this.$nextTick(() => {
this.$refs.input.focus()
});
} else { } else {
this.timeOpen = false; this.timeOpen = false;
this.timeForce = false;
this.assistForce = false;
this.addsubForce = false;
} }
} }
}, },
@ -653,14 +683,17 @@ export default {
}, },
dropTask(command) { dropTask(command) {
if (command === 'complete') { switch (command) {
case 'complete':
this.updateData('complete') this.updateData('complete')
} break;
else if (command === 'uncomplete') { case 'uncomplete':
this.updateData('uncomplete') this.updateData('uncomplete')
} break;
else if (command === 'delete') { case 'archived':
this.archivedOrRemoveTask('delete'); case 'delete':
this.archivedOrRemoveTask(command);
break;
} }
}, },
@ -705,10 +738,11 @@ export default {
}, },
archivedOrRemoveTask(type) { archivedOrRemoveTask(type) {
let typeName = type == 'delete' ? '删除' : '归档';
let typeTitle = this.taskDetail.parent_id > 0 ? '子任务' : '任务'; let typeTitle = this.taskDetail.parent_id > 0 ? '子任务' : '任务';
$A.modalConfirm({ $A.modalConfirm({
title: '删除' + typeTitle, title: typeName + typeTitle,
content: '你确定要删除' + typeTitle + '【' + this.taskDetail.name + '】吗？', content: '你确定要' + typeName + typeTitle + '【' + this.taskDetail.name + '】吗？',
loading: true, loading: true,
onOk: () => { onOk: () => {
if (this.taskDetail.loading === true) { if (this.taskDetail.loading === true) {
@ -867,7 +901,44 @@ export default {
this.addsubLoad--; this.addsubLoad--;
$A.modalError(msg); $A.modalError(msg);
}); });
},
dropAdd(command) {
switch (command) {
case 'priority':
this.$set(this.taskDetail, 'p_name', this.$L('未设置'));
this.$nextTick(() => {
this.$refs.priority.show();
})
break;
case 'assist':
this.assistForce = true;
this.openAssist();
this.$nextTick(() => {
this.$refs.assist.handleClick();
});
break;
case 'times':
this.timeForce = true;
this.$nextTick(() => {
this.$refs.time.click()
})
break;
case 'file':
this.$refs.upload.handleClick();
break;
case 'subtask':
this.addsubForce = true;
this.$nextTick(() => {
this.addsubOpen();
});
break;
} }
},
} }
} }
</script> </script>

10
resources/assets/js/pages/manage/components/TaskRow.vue
View File

@ -30,7 +30,7 @@
<Icon type="md-radio-button-off" />{{$L('完成')}} <Icon type="md-radio-button-off" />{{$L('完成')}}
</div> </div>
</EDropdownItem> </EDropdownItem>
<EDropdownItem command="archived"> <EDropdownItem v-if="item.parent_id === 0" command="archived">
<div class="item"> <div class="item">
<Icon type="ios-filing" />{{$L('归档')}} <Icon type="ios-filing" />{{$L('归档')}}
</div> </div>
@ -51,14 +51,14 @@
</EDropdownMenu> </EDropdownMenu>
</EDropdown> </EDropdown>
<div class="item-title" @click="openTask(item)">{{item.name}}</div> <div class="item-title" @click="openTask(item)">{{item.name}}</div>
<div v-if="item.sub_num > 0" class="item-sub-num" @click="getSublist(item)">
<Icon type="md-git-merge" />
{{item.sub_complete}}/{{item.sub_num}}
</div>
<div class="item-icons"> <div class="item-icons">
<div v-if="item.file_num > 0" class="item-icon">{{item.file_num}}<Icon type="ios-link-outline" /></div> <div v-if="item.file_num > 0" class="item-icon">{{item.file_num}}<Icon type="ios-link-outline" /></div>
<div v-if="item.msg_num > 0" class="item-icon">{{item.msg_num}}<Icon type="ios-chatbubbles-outline" /></div> <div v-if="item.msg_num > 0" class="item-icon">{{item.msg_num}}<Icon type="ios-chatbubbles-outline" /></div>
</div> </div>
<div v-if="item.sub_num > 0" class="item-sub-num" @click="getSublist(item)">
<Icon type="md-git-merge" />
{{item.sub_complete}}/{{item.sub_num}}
</div>
</Col> </Col>
<Col span="3" class="row-column"> <Col span="3" class="row-column">
<div v-if="item.parent_id === 0" class="task-column">{{item.column_name}}</div> <div v-if="item.parent_id === 0" class="task-column">{{item.column_name}}</div>

15
resources/assets/sass/pages/components/task-detail.scss vendored
View File

@ -242,6 +242,8 @@
} }
.subtask-avatar { .subtask-avatar {
height: 26px; height: 26px;
line-height: 26px;
margin-top: -2px;
cursor: pointer; cursor: pointer;
} }
.ivu-icon-ios-loading { .ivu-icon-ios-loading {
@ -249,6 +251,15 @@
} }
} }
} }
&.nosub {
margin-top: 0;
> li {
.add-input,
.add-button {
margin-top: 3px;
}
}
}
} }
} }
.add { .add {
@ -369,7 +380,7 @@
overflow: auto; overflow: auto;
.head { .head {
.menu { .menu {
margin-right: 0; margin: 0 2px;
} }
} }
} }
@ -399,7 +410,9 @@
padding-left: 0; padding-left: 0;
> p { > p {
margin-right: 28px; margin-right: 28px;
cursor: pointer;
&.active { &.active {
cursor: default;
font-size: 18px; font-size: 18px;
} }
} }