Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

3 天以前 a4907e75088054574d7dce76c9995502779c5eeb

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

@@ -1,16 +1,28 @@
<template>
  <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
  <LoadingLayout>
    <ContentView>
      <MyTaskCard :showMyTaskArrow="false" :showTime="false"></MyTaskCard>
      <MyTaskCard
        :name="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.name"
        :addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.addressName"
        :showMyTaskArrow="false"
        :showTime="false"
      ></MyTaskCard>
      <ChunkTitle title="验收列表" />
    </ContentView>
    <InfiniteLoading
      scrollViewClassName="common-infinite-scroll-list"
      v-bind="infiniteLoadingProps"
      :key="queryState.status"
    >
      <template #renderItem="{ item }">
        <TaskCheckCard @click="goHandleTaskDetail(item)" />
        <TaskCheckCard
          :avatar="setOSSLink(item.avatar)"
          :name="item.name"
          :gender="item.gender"
          :isReal="item.isReal"
          :contactPhoneNumber="item.contactPhoneNumber"
          :checkReceiveStatus="item.checkReceiveStatus"
          @checkReceive="goTaskDetail(item)"
        />
      </template>
    </InfiniteLoading>
  </LoadingLayout>
@@ -18,64 +30,54 @@

<script setup lang="ts">
import Taro from '@tarojs/taro';
import { useQuery } from '@tanstack/vue-query';
import * as flexWorkerServices from '@12333/services/api/FlexWorker';
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import TaskCheckCard from '../components/TaskCheckCard.vue';
import { MyTaskCard } from '@12333/components';
import { EnumTaskCheckReceiveStatus } from '@12333/constants';
import { setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';

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

const router = Taro.useRouter();
const taskId = router.params?.id ?? '';

const {
  isLoading,
  isError,
  data: detail,
  refetch,
} = useQuery({
  queryKey: ['flexWorkerServices/getOrdeForDetail', taskId],
  queryFn: async () => {
    return await flexWorkerServices.getOrdeForDetail(
      { id: taskId },
      {
        showLoading: false,
      }
    );
  },
  placeholderData: () => ({} as API.OrderInfoDto),
});

const queryState = reactive({
  status: 10,
});
const id = router.params?.id ?? '';
const date = router.params?.date ?? '';
const checkReceiveStatus = Number(router.params?.checkReceiveStatus);

const { infiniteLoadingProps } = useInfiniteLoading(
  ({ pageParam }) => {
    let params: API.GetFlexTaskListInput = {
    let params: API.GetCheckReceiveTaskQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
        orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
      },
      taskInfoId: id,
      date: dayjs(date).format('YYYY-MM-DD'),
      checkReceiveStatus: checkReceiveStatus,
    };

    return flexWorkerServices.getFlexTaskByArrange(params, {
    return taskCheckReceiveServices.getCheckReceiveTask(params, {
      showLoading: false,
    });
  },
  {
    queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState],
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTask'],
  }
);

function goHandleTaskDetail(item: API.GetFlexTaskListOutput) {
  Taro.navigateTo({
    url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}`,
  });
function goTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
  if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed) {
    Taro.navigateTo({
      url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
    });
  }
  if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive) {
    Taro.navigateTo({
      url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
    });
  }
}
</script>