fix: bug

zhengyiming

5 天以前 23b5582be8bfadad2ef9ee352dc61644474abe55

 apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue

@@ -1,7 +1,7 @@
<template>
  <Calendar v-model="queryMenuState.time"></Calendar>
  <Calendar key="calendar" v-model="queryState.date"></Calendar>
  <ProTabs
    v-model="queryMenuState.checkReceiveStatus"
    v-model="queryState.checkReceiveStatus"
    name="task-tab"
    :showPaneContent="false"
    class="task-tabs"
@@ -9,46 +9,74 @@
    title-gutter="8"
    title-scroll
  >
    <ProTabPane :title="`待提交`" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane>
    <ProTabPane :title="`待验收`" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane>
    <ProTabPane :title="`待提交`" :pane-key="EnumTaskCheckReceiveStatus.WaitSubmit"></ProTabPane>
    <ProTabPane
      :title="`待验收`"
      :pane-key="EnumTaskCheckReceiveStatus.WaitCheckReceive"
    ></ProTabPane>
    <ProTabPane :title="`已验收`" :pane-key="EnumTaskCheckReceiveStatus.Completed"></ProTabPane>
  </ProTabs>
  <InfiniteLoading
    scrollViewClassName="common-infinite-scroll-list"
    v-bind="infiniteLoadingProps"
    :key="queryMenuState.checkReceiveStatus"
  >
    <template #renderItem="{ item }">
      <MyTaskCard
        :name="item.name"
        :beginTime="item.beginTime"
        :endTime="item.endTime"
        :addressName="item.addressName"
        @click="goSubmitTaskDetail(item)"
      />
    </template>
  </InfiniteLoading>
  <div class="task-list-container">
    <InfiniteLoading
      scrollViewClassName="common-infinite-scroll-list"
      v-bind="infiniteLoadingProps"
      :key="queryState.checkReceiveStatus"
    >
      <template #renderItem="{ item }">
        <MyTaskCard
          :name="item.name"
          :beginTime="item.beginTime"
          :endTime="item.endTime"
          :addressName="item.addressName"
          @click="goSubmitTaskDetail(item)"
        />
      </template>
    </InfiniteLoading>
  </div>
</template>

<script setup lang="ts">
import { MyTaskCard, ProTabs, ProTabPane, Calendar } from '@12333/components';
import Taro from '@tarojs/taro';
import { EnumTaskCheckReceiveStatus } from '@12333/constants';
import { useTaskList } from '@12333/hooks';
import { EnumTaskCheckReceiveStatus, EnumTaskCheckReceiveMethod } from '@12333/constants';
import { useCheckReceiveTasks } from '@12333/hooks';
import dayjs from 'dayjs';

defineOptions({
  name: 'InnerPage',
});

const { queryMenuState, infiniteLoadingProps } = useTaskList({
  defaultQueryMenuState: {
    checkReceiveStatus: EnumTaskCheckReceiveStatus.Wait,
  },
});
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();

function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskCheckDetail}?taskId=${item.id}`,
  });
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
  if (
    item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
    dayjs(queryState.date).isBefore(dayjs(), 'day')
  ) {
    Taro.navigateTo({
      url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
        queryState.date
      ).format('YYYY-MM-DD')}`,
    });
  } else {
    Taro.navigateTo({
      url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
        'YYYY-MM-DD'
      )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
    });
  }
}
</script>

<style lang="scss">
@import '@/styles/common.scss';

.taskCheck-page-wrapper {
  .task-list-container {
    flex: 1;
    min-height: 0;
    display: flex;
    flex-direction: column;
  }
}
</style>