diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue index 920f1d0..f0dbd6a 100644 --- a/src/pages/task/index.vue +++ b/src/pages/task/index.vue @@ -26,10 +26,17 @@ v-for="item in list" :key="item.id" :title="item.name" - :status-text="statusFun(item.taskable.status, 'task_hygienes' ,'name')" - :status-color="statusFun(item.taskable.status, 'task_hygienes' ,'color')" + :status-text=" + statusFun(item.taskable.status, item.taskable_type, 'name') + " + :status-color=" + statusFun(item.taskable.status, item.taskable_type, 'color') + " :body="[ - {label: '任务时间: ', value: item.start_format + '-' + item.end_format} + { + label: '任务时间: ', + value: item.start_format + '-' + item.end_format, + }, ]" @click.stop="applyClick(item)" /> @@ -50,10 +57,20 @@ v-for="item in list" :key="item.id" :title="item?.check?.subject?.task?.name" - :status-text="statusFun(item.check_status,'statusExpense2','name')" - :status-color="statusFun(item.check_status,'statusExpense2','color')" + :status-text=" + statusFun(item.check_status, 'statusExpense2', 'name') + " + :status-color=" + statusFun(item.check_status, 'statusExpense2', 'color') + " :body="[ - {label: '任务时间: ', value: item?.check?.subject?.task?.start_format + '-' + item?.check?.subject?.task?.end_format} + { + label: '任务时间: ', + value: + item?.check?.subject?.task?.start_format + + '-' + + item?.check?.subject?.task?.end_format, + }, ]" @click.stop="checkClick(item)" /> @@ -91,7 +108,7 @@ const tabList = ref([ apiUrl: '/workflow', params: { subject_type: 'task_hygienes', - include: 'check.subject.task' + include: 'check.subject.task', }, }, ]) @@ -112,8 +129,9 @@ const applyClick = (item) => { const type = item.taskable_type const status = item.taskable.status let url - if (status === 2 || status == 4) { - url = `/pages/task/${type}_submit?id=${item.id}&date=${item.taskable.date}` + if (status === 2 || status == 4 || type=='task_ledgers') { + const date = status != 3 || status != 5 ? `&date=${item.taskable.date}` : '' + url = `/pages/task/${type}_submit?id=${item.id}${date}` } else { url = `/pages/task/detail?id=${item.id}` }