From 873d071bdb7959dc3c837b3ca6c6e9671e61e07c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 29 十二月 2025 17:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 21 ++++------
apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 24 +++---------
apps/cStandardMiniApp/src/pages/task/InnerPage.vue | 3 +
packages/services/apiV2/typings.d.ts | 22 +++++++++++
apps/bStandardMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue | 8 +++
apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue | 6 +-
6 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index f3396bd..6a9520a 100644
--- a/apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
+++ b/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';
diff --git a/apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 991bd71..94ed13b 100644
--- a/apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/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,
diff --git a/apps/bStandardMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue
index e299796..74b4a09 100644
--- a/apps/bStandardMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue
+++ b/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
diff --git a/apps/cStandardMiniApp/src/pages/task/InnerPage.vue b/apps/cStandardMiniApp/src/pages/task/InnerPage.vue
index 375515e..4747bb1 100644
--- a/apps/cStandardMiniApp/src/pages/task/InnerPage.vue
+++ b/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
diff --git a/apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue b/apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
index a0dbadf..3845d4f 100644
--- a/apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
+++ b/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>
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 117a99a..da9fa72 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/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 {
--
Gitblit v1.10.0