github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-23 05:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 修改任务时间添加备注

Browse Source
This commit is contained in:
kuaifan 2022-11-22 11:45:19 +08:00
parent 4a7cb9abc1
commit ab24ca5b4f
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/ProjectTask.php
View File

@ -702,7 +702,7 @@ class ProjectTask extends AbstractModel
$this->start_at = null; $this->start_at = null;
$this->end_at = null; $this->end_at = null;
$times = $data['times']; $times = $data['times'];
list($start, $end) = is_string($times) ? explode(",", $times) : (is_array($times) ? $times : []); list($start, $end, $desc) = is_string($times) ? explode(",", $times) : (is_array($times) ? $times : []);
if (Base::isDate($start) && Base::isDate($end) && $start != $end) { if (Base::isDate($start) && Base::isDate($end) && $start != $end) {
$start_at = Carbon::parse($start); $start_at = Carbon::parse($start);
$end_at = Carbon::parse($end); $end_at = Carbon::parse($end);
@ -763,7 +763,7 @@ class ProjectTask extends AbstractModel
}); });
} }
$newStringAt = $this->start_at ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : ''; $newStringAt = $this->start_at ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
$this->addLog("修改{任务}时间", [ $this->addLog("修改{任务}时间" . ($desc ? "（备注：{$desc}）" : ""), [
'change' => [$oldStringAt, $newStringAt] 'change' => [$oldStringAt, $newStringAt]
]); ]);

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

@ -922,7 +922,24 @@ export default {
break; break;
case 'times': case 'times':
this.$set(this.taskDetail, 'times', [params.start_at, params.end_at]) if (this.taskDetail.start_at
&& (Math.abs($A.Time(this.taskDetail.start_at) - $A.Time(params.start_at)) > 60 || Math.abs($A.Time(this.taskDetail.end_at) - $A.Time(params.end_at)) > 60)
&& typeof params.desc === "undefined") {
$A.modalInput({
title: `修改任务时间`,
placeholder: `请输入修改备注`,
okText: "确定",
onOk: (desc) => {
if (!desc) {
return `请输入修改备注`
}
this.updateData("times", Object.assign(params, {desc}))
return false
},
});
return;
}
this.$set(this.taskDetail, 'times', [params.start_at, params.end_at, params.desc])
break; break;
case 'loop': case 'loop':