Browse Source

计划加上判断联合,时间排序

test
wangmingyong@163.com 3 weeks ago
parent
commit
b4d73d58e6
  1. 14
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue

14
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue

@ -63,7 +63,7 @@
<div class="task-content-col">
<div class="task-title-row">
<span class="task-title">{{ item.enterpriseName || '-' }}</span>
<span v-if="item.isUnion === 1" class="union-badge"></span>
<span v-if="item.isUnion === 1 && item.associatedPlans && item.associatedPlans.length" class="union-badge"></span>
</div>
<div class="task-time-info">
<van-icon name="clock-o" size="14" color="#999" />
@ -302,6 +302,7 @@ const getTimeStart = (item) => {
const time = item.planActualTime || item.planTime;
if (time === 1) return '09:00';
if (time === 2) return '14:00';
if (time === 3) return '18:00';
return '';
};
@ -309,12 +310,13 @@ const getTimeEnd = (item) => {
const time = item.planActualTime || item.planTime;
if (time === 1) return '12:00';
if (time === 2) return '18:00';
if (time === 3) return '21:00';
return '';
};
const getTimeRange = (item) => {
const time = item.planActualTime || item.planTime;
if (time === 3) return '其他';
// if (time === 3) return '';
return `${getTimeStart(item)}-${getTimeEnd(item)}`;
};
@ -371,6 +373,14 @@ const loadTaskList = () => {
loading.value = false;
if (res.code === 200 && res.data) {
taskList.value = res.data;
// (1) (2)
taskList.value.sort((a, b) => {
const ta = a.planActualTime || a.planTime;
const tb = b.planActualTime || b.planTime;
const ra = ta === 1 ? 0 : ta === 2 ? 1 : 2;
const rb = tb === 1 ? 0 : tb === 2 ? 1 : 2;
return ra - rb;
});
//
loadAssociatedPlans();
} else {

Loading…
Cancel
Save