+
+
+
+
+
+
+
+
+ {{taskDetail.end_at ? expiresFormat(taskDetail.end_at) : '--'}}
+
+
+
+
+
+ --
+
+
+
+
@@ -19,7 +104,8 @@
:rows="1"
:autosize="{ minRows: 1, maxRows: 8 }"
:maxlength="255"
- @on-blur="updateData('name')"/>
+ @on-blur="updateData('name')"
+ @on-keydown="onNameKeydown"/>
{{taskDetail.p_name}}
@@ -56,28 +142,89 @@
-
+
{{$L('负责人')}}
-
+
+
+
+
+
+ --
+
{{$L('协助人员')}}
-
+
+
+
+
+
+
{{$L('截止时间')}}
- - {{taskDetail.end_at}}
+ -
+
+
+
{{cutTime}}
+
{{expiresFormat(taskDetail.end_at)}}
+
{{$L('超期未完成')}}
+
@@ -86,12 +233,13 @@
-
-
![]()
+ ![]()
+
{{file.name}}
{{$A.bytesToSize(file.size)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -222,17 +312,26 @@ import {mapState} from "vuex";
import TEditor from "../../../components/TEditor";
import TaskPriority from "./TaskPriority";
import UserInput from "../../../components/UserInput";
+import TaskUpload from "./TaskUpload";
export default {
name: "TaskDetail",
- components: {UserInput, TaskPriority, TEditor},
+ components: {TaskUpload, UserInput, TaskPriority, TEditor},
+ props: {
+ openTask: {
+ type: Object,
+ default: () => {
+ return {};
+ }
+ },
+ },
data() {
return {
taskDetail: {},
- transferShow: false,
- transferData: {},
- transferLoad: 0,
+ ownerShow: false,
+ ownerData: {},
+ ownerLoad: 0,
assistShow: false,
assistData: {},
@@ -268,6 +367,12 @@ 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',
toolbar: 'uploadImages | uploadFiles | bold italic underline forecolor backcolor | codesample | preview screenload'
},
+
+ timeOpen: false,
+ timeValue: [],
+ timeOptions: {
+ shortcuts: []
+ },
}
},
@@ -285,7 +390,7 @@ export default {
},
computed: {
- ...mapState(['userId', 'projectOpenTask', 'taskPriority']),
+ ...mapState(['userId', 'taskPriority']),
scrollerStyle() {
const {innerHeight, taskDetail} = this;
@@ -327,6 +432,18 @@ export default {
}
},
+ cutTime() {
+ const {nowTime, taskDetail} = this;
+ let string = "";
+ let start_at = Math.round(new Date(taskDetail.start_at).getTime() / 1000);
+ if (start_at > nowTime) {
+ string = $A.formatDate('Y/m/d H:i', start_at) + " ~ "
+ }
+ let end_at = Math.round(new Date(taskDetail.end_at).getTime() / 1000);
+ string+= $A.formatDate('Y/m/d H:i', end_at);
+ return string;
+ },
+
hasFile() {
const {taskDetail} = this;
return $A.isArray(taskDetail.files) && taskDetail.files.length > 0;
@@ -338,15 +455,11 @@ export default {
},
getOwner() {
- return function (task) {
- if (task === undefined) {
- task = this.taskDetail;
- }
- if (!$A.isArray(task.task_user)) {
- return null;
- }
- return task.task_user.find(({owner}) => owner === 1);
+ const {taskDetail} = this;
+ if (!$A.isArray(taskDetail.task_user)) {
+ return null;
}
+ return taskDetail.task_user.find(({owner}) => owner === 1);
},
getAssist() {
@@ -407,13 +520,75 @@ export default {
},
watch: {
- projectOpenTask(data) {
- this.taskDetail = $A.cloneJSON(data);
- if (data._show) this.$nextTick(this.$refs.input.focus)
+ openTask: {
+ handler(data) {
+ this.taskDetail = $A.cloneJSON(data);
+ },
+ immediate: true,
+ deep: true
},
+ 'openTask._show' (v) {
+ if (v) {
+ this.$nextTick(this.$refs.input.focus)
+ } else {
+ this.timeOpen = false;
+ }
+ }
},
methods: {
+ initLanguage() {
+ const lastSecond = (e) => {
+ return new Date($A.formatDate("Y-m-d 23:59:29", Math.round(e / 1000)))
+ };
+ this.timeOptions = {
+ shortcuts: [{
+ text: this.$L('今天'),
+ value() {
+ return [new Date(), lastSecond(new Date().getTime())];
+ }
+ }, {
+ text: this.$L('明天'),
+ value() {
+ let e = new Date();
+ e.setDate(e.getDate() + 1);
+ return [new Date(), lastSecond(e.getTime())];
+ }
+ }, {
+ text: this.$L('本周'),
+ value() {
+ return [$A.getData('今天', true), lastSecond($A.getData('本周结束2', true))];
+ }
+ }, {
+ text: this.$L('本月'),
+ value() {
+ return [$A.getData('今天', true), lastSecond($A.getData('本月结束', true))];
+ }
+ }, {
+ text: this.$L('3天'),
+ value() {
+ let e = new Date();
+ e.setDate(e.getDate() + 3);
+ return [new Date(), lastSecond(e.getTime())];
+ }
+ }, {
+ text: this.$L('5天'),
+ value() {
+ let e = new Date();
+ e.setDate(e.getDate() + 5);
+ return [new Date(), lastSecond(e.getTime())];
+ }
+ }, {
+ text: this.$L('7天'),
+ value() {
+ let e = new Date();
+ e.setDate(e.getDate() + 7);
+ return [new Date(), lastSecond(e.getTime())];
+ }
+ }]
+ };
+ },
+
innerHeightListener() {
this.innerHeight = window.innerHeight;
},
@@ -454,6 +629,28 @@ export default {
return duration;
},
+ onNameKeydown(e) {
+ if (e.keyCode === 13) {
+ if (e.shiftKey) {
+ return;
+ }
+ e.preventDefault();
+ this.updateData('name');
+ }
+ },
+
+ dropTask(command) {
+ if (command === 'complete') {
+ this.updateData('complete')
+ }
+ else if (command === 'uncomplete') {
+ this.updateData('uncomplete')
+ }
+ else if (command === 'delete') {
+ this.archivedOrRemoveTask('delete');
+ }
+ },
+
updateData(action, params) {
switch (action) {
case 'complete':
@@ -470,46 +667,77 @@ export default {
this.$set(this.taskDetail, 'p_color', params.color)
action = ['p_level', 'p_name', 'p_color'];
break;
+ case 'times':
+ this.$set(this.taskDetail, 'times', [params.start_at, params.end_at])
+ break;
}
//
let dataJson = {task_id: this.taskDetail.id};
($A.isArray(action) ? action : [action]).forEach(key => {
let newData = this.taskDetail[key];
- let originalData = this.projectOpenTask[key];
+ let originalData = this.openTask[key];
if ($A.jsonStringify(newData) != $A.jsonStringify(originalData)) {
dataJson[key] = newData;
}
})
if (Object.keys(dataJson).length <= 1) return;
//
- this.$store.dispatch("taskUpdate", dataJson).then(() => {
+ this.$store.dispatch("taskUpdate", dataJson).then(({msg}) => {
// 更新成功
- }).catch(() => {
+ $A.messageSuccess(msg);
+ }).catch(({msg}) => {
// 更新失败
+ $A.modalError(msg);
})
},
- openTransfer() {
- this.$set(this.taskDetail, 'owner_userid', [this.getOwner().userid])
- this.$set(this.transferData, 'owner_userid', [this.getOwner().userid]);
- this.transferShow = true;
+ archivedOrRemoveTask(type) {
+ let typeTitle = this.taskDetail.parent_id > 0 ? '子任务' : '任务';
+ $A.modalConfirm({
+ title: '删除' + typeTitle,
+ content: '你确定要删除' + typeTitle + '【' + this.taskDetail.name + '】吗？',
+ loading: true,
+ onOk: () => {
+ if (this.taskDetail.loading === true) {
+ return;
+ }
+ this.$set(this.taskDetail, 'loading', true);
+ this.$store.dispatch("taskArchivedOrRemove", {
+ task_id: this.taskDetail.id,
+ type: type,
+ }).then(({msg}) => {
+ this.$Modal.remove();
+ $A.messageSuccess(msg);
+ }).catch(({msg}) => {
+ this.$Modal.remove();
+ $A.modalError(msg, 301);
+ });
+ }
+ });
},
- onTransfer() {
- if ($A.jsonStringify(this.taskDetail.owner_userid) === $A.jsonStringify(this.transferData.owner_userid)) {
+ openOwner() {
+ this.$set(this.taskDetail, 'owner_userid', [this.getOwner.userid])
+ this.$set(this.ownerData, 'owner_userid', [this.getOwner.userid]);
+ this.ownerShow = true;
+ },
+
+ onOwner() {
+ if ($A.jsonStringify(this.taskDetail.owner_userid) === $A.jsonStringify(this.ownerData.owner_userid)) {
return;
}
- this.transferLoad++;
+ this.ownerLoad++;
this.$store.dispatch("taskUpdate", {
task_id: this.taskDetail.id,
- owner: this.transferData.owner_userid
- }).then(() => {
- this.transferLoad--;
- this.transferShow = false;
+ owner: this.ownerData.owner_userid
+ }).then(({msg}) => {
+ this.ownerLoad--;
+ this.ownerShow = false;
this.$store.dispatch("taskOne", this.taskDetail.id);
+ $A.messageSuccess(msg);
}).catch(({msg}) => {
- this.transferLoad--;
- this.transferShow = false;
+ this.ownerLoad--;
+ this.ownerShow = false;
$A.modalError(msg);
})
},
@@ -518,7 +746,7 @@ export default {
const list = this.getAssist.map(({userid}) => userid)
this.$set(this.taskDetail, 'assist_userid', list)
this.$set(this.assistData, 'assist_userid', list);
- this.$set(this.assistData, 'disabled', [this.getOwner().userid]);
+ this.$set(this.assistData, 'disabled', [this.getOwner.userid]);
this.assistShow = true;
},
@@ -532,16 +760,58 @@ export default {
this.$store.dispatch("taskUpdate", {
task_id: this.taskDetail.id,
assist,
- }).then(() => {
+ }).then(({msg}) => {
this.assistLoad--;
this.assistShow = false;
this.$store.dispatch("taskOne", this.taskDetail.id);
+ $A.messageSuccess(msg);
}).catch(({msg}) => {
this.assistLoad--;
this.assistShow = false;
$A.modalError(msg);
})
- }
+ },
+
+ openTime() {
+ this.timeOpen = !this.timeOpen;
+ if (this.timeOpen) {
+ this.timeValue = this.taskDetail.end_at ? [this.taskDetail.start_at, this.taskDetail.end_at] : [];
+ }
+ },
+
+ timeChange(open) {
+ if (!open) {
+ this.timeOpen = false;
+ }
+ },
+
+ timeClear() {
+ $A.modalConfirm({
+ content: '你确定要取消任务时间吗？',
+ cancelText: '不是',
+ onOk: () => {
+ this.updateData('times', {
+ start_at: false,
+ end_at: false,
+ });
+ this.timeOpen = false;
+ }
+ });
+ },
+
+ timeOk() {
+ let times = $A.date2string(this.timeValue, "Y-m-d H:i");
+ if (times[0] && times[1]) {
+ if ($A.rightExists(times[0], '00:00') && $A.rightExists(times[1], '00:00')) {
+ times[1] = times[1].replace("00:00", "23:59");
+ }
+ }
+ this.updateData('times', {
+ start_at: times[0],
+ end_at: times[1],
+ });
+ this.timeOpen = false;
+ },
}
}
diff --git a/resources/assets/js/pages/manage/components/TaskUpload.vue b/resources/assets/js/pages/manage/components/TaskUpload.vue
new file mode 100644
index 00000000..aeacf98a
--- /dev/null
+++ b/resources/assets/js/pages/manage/components/TaskUpload.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index e5e4fe46..6ec86655 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -389,6 +389,11 @@ export default {
});
if (data.id == state.projectOpenTask.id) {
state.projectOpenTask = Object.assign({}, state.projectOpenTask, data);
+ } else if (data.parent_id == state.projectOpenTask.id) {
+ let index = state.projectOpenTask.sub_task.findIndex(({id}) => id === data.id);
+ if (index > -1) {
+ state.projectOpenTask.sub_task.splice(index, 1, Object.assign(state.projectOpenTask.sub_task[index], data))
+ }
}
},
@@ -522,28 +527,77 @@ export default {
},
/**
- * 更新任务
+ * 添加任务
+ * @param state
* @param dispatch
* @param data
* @returns {Promise
}
*/
- taskUpdate({dispatch}, data) {
+ taskAdd({state, dispatch}, data) {
return new Promise(function (resolve, reject) {
+ const post = state.method.cloneJSON(data);
+ if (state.method.isArray(post.column_id)) {
+ post.column_id = post.column_id.find((val) => val)
+ }
+ if (state.method.isArray(post.owner)) {
+ post.owner = post.owner.find((val) => val)
+ }
+ //
+ dispatch("call", {
+ url: 'project/task/add',
+ data: post,
+ method: 'post',
+ }).then(result => {
+ const {task, in_top, new_column} = result.data;
+ if (state.projectDetail.id == task.project_id) {
+ if (new_column) {
+ state.projectDetail.project_column.push(new_column);
+ }
+ const column = state.projectDetail.project_column.find(({id}) => id === task.column_id);
+ if (column) {
+ if (in_top) {
+ column.project_task.unshift(task);
+ } else {
+ column.project_task.push(task);
+ }
+ }
+ }
+ dispatch('projectOne', task.project_id);
+ resolve(result)
+ }).catch(result => {
+ reject(result)
+ });
+ });
+ },
+
+ /**
+ * 更新任务
+ * @param state
+ * @param dispatch
+ * @param data
+ * @returns {Promise}
+ */
+ taskUpdate({state, dispatch}, data) {
+ return new Promise(function (resolve, reject) {
+ const post = state.method.cloneJSON(data);
+ if (state.method.isArray(post.owner)) {
+ post.owner = post.owner.find((id) => id)
+ }
dispatch("call", {
url: 'project/task/update',
- data: data,
+ data: post,
method: 'post',
}).then(result => {
if (result.data.parent_id) {
dispatch('taskOne', result.data.parent_id);
}
- if (typeof data.complete_at !== "undefined") {
+ if (typeof post.complete_at !== "undefined") {
dispatch('projectOne', result.data.project_id);
}
dispatch("taskData", result.data);
resolve(result)
}).catch(result => {
- dispatch('taskOne', data.task_id);
+ dispatch('taskOne', post.task_id);
reject(result)
});
});
@@ -553,7 +607,7 @@ export default {
* 删除或归档任务
* @param state
* @param dispatch
- * @param data
+ * @param data {task_id, type}
* @returns {Promise}
*/
taskArchivedOrRemove({state, dispatch}, data) {
@@ -565,14 +619,23 @@ export default {
task_id,
},
}).then(result => {
- const column = state.projectDetail.project_column.find(({id}) => id === result.data.column_id);
+ const {data} = result;
+ const column = state.projectDetail.project_column.find(({id}) => id === data.column_id);
if (column) {
- let index = column.project_task.findIndex(({id}) => id === result.data.id);
+ let index = column.project_task.findIndex(({id}) => id === data.id);
if (index > -1) {
column.project_task.splice(index, 1);
}
}
- dispatch('projectDetail', result.data.project_id);
+ if (data.id == state.projectOpenTask.id) {
+ state.projectOpenTask = Object.assign({}, state.projectOpenTask, {_show: false});
+ } else if (data.parent_id == state.projectOpenTask.id) {
+ let index = state.projectOpenTask.sub_task.findIndex(({id}) => id === data.id);
+ if (index > -1) {
+ state.projectOpenTask.sub_task.splice(index, 1)
+ }
+ }
+ dispatch('projectDetail', data.project_id);
resolve(result);
}).catch(result => {
reject(result)
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index a93cd47f..5e843545 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -109,18 +109,49 @@
line-height: 26px;
.el-dropdown {
display: flex;
+ cursor: pointer;
+ }
+ .picker-time {
+ display: flex;
+ align-items: center;
+ line-height: 26px;
+ .time {
+ cursor: pointer;
+ }
+ .ivu-tag {
+ margin-left: 10px;
+ padding: 0 4px;
+ height: 20px;
+ line-height: 18px;
+ .ivu-tag-text {
+ display: flex;
+ align-items: center;
+ > i {
+ padding-right: 2px;
+ }
+ }
+ }
}
}
&.user {
- margin-top: 0;
- > li {
- display: inline-block;
- cursor: pointer;
+ margin-top: 1px;
+ cursor: pointer;
+ .user-list {
+ > div {
+ display: inline-block;
+ margin-right: 6px;
+ }
}
}
&.file {
> li {
margin-bottom: 2px;
+ .file-load {
+ margin: 0;
+ padding: 2px;
+ width: 16px;
+ height: 16px;
+ }
.file-ext {
width: 16px;
}
@@ -138,17 +169,25 @@
&.subtask {
> li {
align-items: flex-start;
- margin-bottom: 2px;
+ margin-bottom: 4px;
.subtask-icon {
width: 16px;
height: 26px;
line-height: 26px;
- font-size: 16px;
- color: #cccccc;
- margin-right: 8px;
+ margin-right: 6px;
cursor: pointer;
- &.completed {
- color: #87d068;
+ .loading {
+ width: 16px;
+ height: 16px;
+ margin: 0;
+ padding: 2px;
+ }
+ .ivu-icon {
+ font-size: 16px;
+ color: #cccccc;
+ &.completed {
+ color: #87d068;
+ }
}
&.sub-icon {
font-size: 16px;
@@ -168,7 +207,7 @@
margin-right: 16px;
display: flex;
.ivu-input {
- margin: -1px 0;
+ margin: -2px 0;
padding: 4px 0;
resize: none;
border-color: transparent;
@@ -179,31 +218,28 @@
}
}
.subtask-time {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- margin-right: 6px;
- font-size: 13px;
- height: 26px;
- line-height: 26px;
- &.overdue {
- font-weight: 600;
- color: #ed4014;
- }
- &.today {
- font-weight: 500;
- color: #ff9900;
+ margin-right: 8px;
+ .time {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 13px;
+ height: 26px;
+ line-height: 26px;
+ cursor: pointer;
+ &.overdue {
+ font-weight: 600;
+ color: #ed4014;
+ }
+ &.today {
+ font-weight: 500;
+ color: #ff9900;
+ }
}
}
.subtask-avatar {
height: 26px;
- line-height: 1;
- .avatar-box {
- > em {
- right: -2px;
- bottom: -1px;
- }
- }
+ cursor: pointer;
}
}
}
@@ -240,6 +276,9 @@
}
}
}
+ .upload {
+ display: none;
+ }
}
.task-dialog {
flex: 1;
@@ -388,4 +427,15 @@
}
}
-
+.task-detail-avatar-buttons {
+ margin-top: 12px;
+ margin-bottom: 4px;
+ text-align: right;
+ position: absolute;
+ top: 5px;
+ right: 14px;
+ > button {
+ font-size: 12px;
+ transform: scale(0.9);
+ }
+}