diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue
index 21bf9b59d..1b8d3b2f6 100644
--- a/resources/assets/js/components/Mobile/Tabbar.vue
+++ b/resources/assets/js/components/Mobile/Tabbar.vue
@@ -21,9 +21,9 @@
{{$L(item.label)}}
-
-
-
+
+
+
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 5e4000b3d..8d916175c 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -39,7 +39,10 @@
:key="key"
class="task-title"
@click.native="openTask(item)"
- :name="item.name">{{ item.name }}
+ :name="item.name">
+ {{item.flow_item_name}}
+ {{ item.name }}
+
{{ $L('暂无打开记录') }}
@@ -136,9 +139,9 @@
-
-
-
+
+
+
@@ -374,9 +377,11 @@ import Report from "./manage/components/Report";
import notificationKoro from "notification-koro1";
import {Store} from "le5le-store";
import MobileBack from "../components/Mobile/Back";
+import TaskMenu from "./manage/components/TaskMenu";
export default {
components: {
+ TaskMenu,
MobileBack,
MobileTabbar,
UserInput,
@@ -539,7 +544,7 @@ export default {
unreadTotal() {
if (this.userId > 0) {
- return this.msgAllUnread + this.dashboardTask.overdue.length + this.reportUnreadNumber
+ return this.msgAllUnread + this.dashboardTask.overdue_count + this.reportUnreadNumber
} else {
return 0
}
diff --git a/resources/assets/js/pages/manage/components/TaskMenu.vue b/resources/assets/js/pages/manage/components/TaskMenu.vue
index 10f855595..5e2006a3b 100644
--- a/resources/assets/js/pages/manage/components/TaskMenu.vue
+++ b/resources/assets/js/pages/manage/components/TaskMenu.vue
@@ -270,15 +270,17 @@ export default {
//
Object.keys(updata).forEach(key => this.$set(this.task, key, updata[key]));
//
- this.$store.dispatch("taskUpdate", Object.assign(updata, {
+ const updateData = Object.assign(updata, {
task_id: this.task.id,
- })).then(({data, msg}) => {
+ });
+ this.$store.dispatch("taskUpdate", updateData).then(({data, msg}) => {
$A.messageSuccess(msg);
resolve()
+ this.$store.dispatch("saveTaskBrowse", updateData.task_id);
this.$emit("on-update", data)
}).catch(({msg}) => {
$A.modalError(msg);
- this.$store.dispatch("getTaskOne", this.task.id).catch(() => {})
+ this.$store.dispatch("getTaskOne", updateData.task_id).catch(() => {})
reject()
});
})
@@ -311,6 +313,7 @@ export default {
}
this.$store.dispatch(typeDispatch, typeData).then(({msg}) => {
$A.messageSuccess(msg);
+ this.$store.dispatch("saveTaskBrowse", typeData.task_id);
}).catch(({msg}) => {
$A.modalError(msg, 301);
}).finally(_ => {
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index ed9060f1c..11cf92ee6 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -8,21 +8,21 @@
{{getTitle('today')}}
-
{{dashboardTask.today.length}}
+
{{dashboardTask.today_count}}
{{getTitle('overdue')}}
-
{{dashboardTask.overdue.length}}
+
{{dashboardTask.overdue_count}}
{{getTitle('all')}}
-
{{dashboardTask.all.length}}
+
{{dashboardTask.all_count}}
@@ -136,7 +136,7 @@ export default {
total() {
const {dashboardTask} = this;
- return dashboardTask.today.length + dashboardTask.overdue.length + dashboardTask.all.length;
+ return dashboardTask.today_count + dashboardTask.overdue_count + dashboardTask.all_count;
},
},
@@ -144,7 +144,7 @@ export default {
getTitle(type) {
switch (type) {
case 'today':
- return this.$L('今日任务');
+ return this.$L('今日到期');
case 'overdue':
return this.$L('超期任务');
case 'all':
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index 4335e23ba..3192a9fb3 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -115,26 +115,37 @@ export default {
return task.owner;
}
let array = state.cacheTasks.filter(task => filterTask(task));
+ let tmpCount = 0;
if (state.taskCompleteTemps.length > 0) {
let tmps = state.cacheTasks.filter(task => state.taskCompleteTemps.includes(task.id) && filterTask(task, false));
if (tmps.length > 0) {
+ tmpCount = tmps.length
array = $A.cloneJSON(array)
array.push(...tmps);
}
}
const todayTasks = array.filter(task => {
- const start = $A.Date(task.start_at),
- end = $A.Date(task.end_at);
- return (start <= todayStart && todayStart <= end) || (start <= todayEnd && todayEnd <= end) || (start > todayStart && todayEnd > end);
+ const end = $A.Date(task.end_at);
+ return todayStart <= end && end <= todayEnd;
})
const overdueTasks = array.filter(task => {
return task.end_at && $A.Date(task.end_at) <= todayNow;
})
-
- return {
+ const result = {
today: todayTasks,
+ today_count: todayTasks.length,
+
overdue: overdueTasks,
- all: array
+ overdue_count: overdueTasks.length,
+
+ all: array,
+ all_count: array.length,
+ };
+ if (tmpCount > 0) {
+ result.today_count -= todayTasks.filter(task => state.taskCompleteTemps.includes(task.id)).length
+ result.overdue_count -= overdueTasks.filter(task => state.taskCompleteTemps.includes(task.id)).length
+ result.all_count -= tmpCount
}
+ return result
},
}