diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 50cc00ef..e18ba2e6 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -261,7 +261,7 @@
{{taskDetail.end_at ? cutTime : '--'}}
{{expiresFormat(taskDetail.end_at)}}
- {{$L('超期未完成')}}
+ {{$L('超期未完成')}}
@@ -616,8 +616,8 @@ export default {
cutTime() {
const {taskDetail} = this;
- let start_at = Math.round($A.Date(taskDetail.start_at).getTime() / 1000);
- let end_at = Math.round($A.Date(taskDetail.end_at).getTime() / 1000);
+ let start_at = $A.Date(taskDetail.start_at, true);
+ let end_at = $A.Date(taskDetail.end_at, true);
let string = "";
if ($A.formatDate('Y/m/d', start_at) == $A.formatDate('Y/m/d', end_at)) {
string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('H:i', end_at)
@@ -725,22 +725,25 @@ export default {
},
methods: {
- initLanguage() {
-
- },
-
innerHeightListener() {
this.innerHeight = Math.min(1100, window.innerHeight);
},
within24Hours(date) {
- return Math.round($A.Date(date).getTime() / 1000) - this.nowTime < 86400
+ return $A.Date(date, true) - this.nowTime < 86400
},
expiresFormat(date) {
return $A.countDownFormat(date, this.nowTime)
},
+ isOverdue(taskDetail) {
+ if (taskDetail.overdue) {
+ return true;
+ }
+ return $A.Date(taskDetail.end_at, true) < this.nowTime;
+ },
+
onNameKeydown(e) {
if (e.keyCode === 83) {
if (e.metaKey || e.ctrlKey) {