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

zhengyiming

3 天以前 873d071bdb7959dc3c837b3ca6c6e9671e61e07c

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

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

@@ -23,35 +23,23 @@
      :key="queryState.checkReceiveStatus"
    >
      <template #renderItem="{ item }">
        <!-- <MyTaskCard
        <MyTaskCard
          :name="item.name"
          :beginTime="item.beginTime"
          :endTime="item.endTime"
          :addressName="item.addressName"
          :contacts="item.serverName"
          :contactPhoneNumber="item.serverContactPhoneNumber"
          :showContact="true"
          @click="goSubmitTaskDetail(item)"
        /> -->
        <StandardTaskCheckCard
          :serviceName="item.name"
          :begin-time="item.beginTime"
          :end-time="item.endTime"
          :contact="item.name"
          :contactPhoneNumber="item.name"
          :address-detail="item.addressName"
          @click="goSubmitTaskDetail(item)"
        ></StandardTaskCheckCard>
        />
      </template>
    </InfiniteLoading>
  </div>
</template>

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

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

@@ -1,21 +1,18 @@
<template>
  <LoadingLayout>
    <ContentView>
      <!-- <MyTaskCard
      <MyTaskCard
        :name="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.name"
        :addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.addressName"
        :showMyTaskArrow="false"
        :showTime="false"
      ></MyTaskCard> -->
      <StandardTaskCheckCard
        :serviceName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.name"
        :begin-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.beginTime"
        :end-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.endTime"
        :contact="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.name"
        :contactPhoneNumber="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.name"
        :address-detail="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.addressName"
        :showArrow="false"
      ></StandardTaskCheckCard>
        :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverName"
        :contactPhoneNumber="
          infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverContactPhoneNumber
        "
        :showMyTaskArrow="false"
        :showContact="true"
      ></MyTaskCard>
      <ChunkTitle title="验收列表" />
    </ContentView>
    <InfiniteLoading
@@ -47,7 +44,7 @@
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
import TaskCheckCard from '../components/TaskCheckCard.vue';
import { MyTaskCard, NumberInput, ChunkTitle, StandardTaskCheckCard } from '@12333/components';
import { MyTaskCard, NumberInput, ChunkTitle } from '@12333/components';
import {
  EnumTaskCheckReceiveMethod,
  EnumTaskCheckReceiveStatus,

 apps/bStandardMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue

@@ -4,8 +4,14 @@
      <MyTaskCard
        :name="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.name"
        :addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.addressName"
        :begin-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.beginTime"
        :end-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.endTime"
        :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverName"
        :contactPhoneNumber="
          infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverContactPhoneNumber
        "
        :showMyTaskArrow="false"
        :showTime="false"
        :showContact="true"
      ></MyTaskCard>
      <ChunkTitle title="验收列表" />
      <TaskCheckCard

 apps/cStandardMiniApp/src/pages/task/InnerPage.vue

@@ -28,6 +28,9 @@
          :addressName="item.addressName"
          :begin-time="item.beginTime"
          :end-time="item.endTime"
          :contacts="item.serverName"
          :contactPhoneNumber="item.serverContactPhoneNumber"
          :showContact="true"
          :showActions="
            OrderUtils.isContainCheckIn(item.checkReceiveMethods) &&
            queryState.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed

 apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue

@@ -30,7 +30,7 @@
      </nut-form>
    </ContentScrollView>
    <PageFooter :isOnlyAction="false">
      <template v-if="isContainCheckIn">
      <!-- <template v-if="isContainCheckIn">
        <PageFooterBtn type="primary" v-if="!detail.userCheckHistoryType" @click="handleCheckIn()"
          >签到</PageFooterBtn
        >
@@ -40,8 +40,8 @@
          @click="handleCheckOut()"
          >签出</PageFooterBtn
        >
      </template>
      <PageFooterBtn v-else type="primary" @click="handleSubmit()">提交</PageFooterBtn>
      </template> -->
      <PageFooterBtn type="primary" @click="handleSubmit()">提交</PageFooterBtn>
    </PageFooter>
  </LoadingLayout>
</template>

 packages/services/apiV2/typings.d.ts

@@ -5078,6 +5078,11 @@
    description?: string;
    /** 任务地点名称 */
    addressName?: string;
    server?: GetCheckReceiveTasksQueryResultServer;
    /** 服务人员姓名 */
    serverName?: string;
    /** 服务人员联系方式 */
    serverContactPhoneNumber?: string;
  }

  interface GetCheckReceiveTasksQuery {
@@ -5146,6 +5151,18 @@
    checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
    /** 人员数量 */
    arrangeUserCount?: number;
    server?: GetCheckReceiveTasksQueryResultServer;
    /** 服务人员姓名 */
    serverName?: string;
    /** 服务人员联系方式 */
    serverContactPhoneNumber?: string;
  }

  interface GetCheckReceiveTasksQueryResultServer {
    /** 姓名 */
    name?: string;
    /** 手机号 */
    contactPhoneNumber?: string;
  }

  interface GetCheckReceiveTaskUserSubmitCheckHistoriesQuery {
@@ -5329,6 +5346,11 @@
    contacts?: string;
    /** 联系电话 */
    contactPhoneNumber?: string;
    server?: GetCheckReceiveTasksQueryResultServer;
    /** 服务人员姓名 */
    serverName?: string;
    /** 服务人员联系方式 */
    serverContactPhoneNumber?: string;
  }

  interface GetCodeUrlQueryResult {