From 7d80d093585939e22af224a03dd432dac80b821d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 31 十二月 2025 13:04:03 +0800
Subject: [PATCH] fix: bug
---
apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 4 +-
apps/housekeepingMiniApp/.eslintrc-auto-import.json | 3 +
apps/housekeepingMiniApp/auto-imports.d.ts | 2 +
apps/cStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 4 +-
apps/housekeepingMiniApp/src/hooks/openStandardServices.ts | 38 +++++++++++++++++++
apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 4 +-
apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue | 28 +-------------
apps/cStandardMiniApp/src/pages/task/InnerPage.vue | 4 +-
packages/services/apiV2/typings.d.ts | 16 ++++++++
apps/housekeepingMiniApp/src/hooks/index.ts | 1
apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue | 4 +-
11 files changed, 71 insertions(+), 37 deletions(-)
diff --git a/apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index 6a9520a..3416c55 100644
--- a/apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
@@ -28,8 +28,8 @@
:beginTime="item.beginTime"
:endTime="item.endTime"
:addressName="item.addressName"
- :contacts="item.serverName"
- :contactPhoneNumber="item.serverContactPhoneNumber"
+ :contacts="item.receiveName"
+ :contactPhoneNumber="item.receiveContactPhoneNumber"
:showContact="true"
@click="goSubmitTaskDetail(item)"
/>
diff --git a/apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 94ed13b..3af370a 100644
--- a/apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -6,9 +6,9 @@
:addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.addressName"
:begin-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.beginTime"
:end-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.endTime"
- :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverName"
+ :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.receiveName"
:contactPhoneNumber="
- infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverContactPhoneNumber
+ infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.receiveContactPhoneNumber
"
:showMyTaskArrow="false"
:showContact="true"
diff --git a/apps/cStandardMiniApp/src/pages/task/InnerPage.vue b/apps/cStandardMiniApp/src/pages/task/InnerPage.vue
index 4747bb1..8ae7c20 100644
--- a/apps/cStandardMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cStandardMiniApp/src/pages/task/InnerPage.vue
@@ -28,8 +28,8 @@
:addressName="item.addressName"
:begin-time="item.beginTime"
:end-time="item.endTime"
- :contacts="item.serverName"
- :contactPhoneNumber="item.serverContactPhoneNumber"
+ :contacts="item.receiveName"
+ :contactPhoneNumber="item.receiveContactPhoneNumber"
:showContact="true"
:showActions="
OrderUtils.isContainCheckIn(item.checkReceiveMethods) &&
diff --git a/apps/cStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/cStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index b120d76..388ed22 100644
--- a/apps/cStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/cStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -8,9 +8,9 @@
:beginTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.beginTime"
:endTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.endTime"
:contactPhoneNumber="
- infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.contactPhoneNumber
+ infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.receiveContactPhoneNumber
"
- :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.contacts"
+ :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.receiveName"
:showMyTaskArrow="false"
showContact
></MyTaskCard>
diff --git a/apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue b/apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
index 5d3b6af..6cfadbf 100644
--- a/apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
+++ b/apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
@@ -6,8 +6,8 @@
:addressName="taskInfoDetail?.addressName ?? ''"
:beginTime="taskInfoDetail?.beginTime"
:endTime="taskInfoDetail.endTime"
- :contactPhoneNumber="taskInfoDetail.serverContactPhoneNumber"
- :contacts="taskInfoDetail.serverName"
+ :contactPhoneNumber="taskInfoDetail.receiveContactPhoneNumber"
+ :contacts="taskInfoDetail.receiveName"
:showMyTaskArrow="false"
showContact
></MyTaskCard>
diff --git a/apps/housekeepingMiniApp/.eslintrc-auto-import.json b/apps/housekeepingMiniApp/.eslintrc-auto-import.json
index 59c0d48..311138f 100644
--- a/apps/housekeepingMiniApp/.eslintrc-auto-import.json
+++ b/apps/housekeepingMiniApp/.eslintrc-auto-import.json
@@ -113,6 +113,7 @@
"NODE_ENV": true,
"TabBarPageRouterList": true,
"useaa": true,
- "useEnterpriseAddresses": true
+ "useEnterpriseAddresses": true,
+ "useGetOpenStandardServices": true
}
}
diff --git a/apps/housekeepingMiniApp/auto-imports.d.ts b/apps/housekeepingMiniApp/auto-imports.d.ts
index 3378012..2ee54e8 100644
--- a/apps/housekeepingMiniApp/auto-imports.d.ts
+++ b/apps/housekeepingMiniApp/auto-imports.d.ts
@@ -84,6 +84,7 @@
const useCssModule: typeof import('vue')['useCssModule']
const useCssVars: typeof import('vue')['useCssVars']
const useEnterpriseAddresses: typeof import('./src/hooks/enterprise')['useEnterpriseAddresses']
+ const useGetOpenStandardServices: typeof import('./src/hooks/openStandardServices')['useGetOpenStandardServices']
const useGoLogin: typeof import('./src/hooks/user')['useGoLogin']
const useId: typeof import('vue')['useId']
const useIsLogin: typeof import('./src/hooks/user')['useIsLogin']
@@ -202,6 +203,7 @@
readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
readonly useEnterpriseAddresses: UnwrapRef<typeof import('./src/hooks/enterprise')['useEnterpriseAddresses']>
+ readonly useGetOpenStandardServices: UnwrapRef<typeof import('./src/hooks/openStandardServices')['useGetOpenStandardServices']>
readonly useGoLogin: UnwrapRef<typeof import('./src/hooks/user')['useGoLogin']>
readonly useId: UnwrapRef<typeof import('vue')['useId']>
readonly useIsLogin: UnwrapRef<typeof import('./src/hooks/user')['useIsLogin']>
diff --git a/apps/housekeepingMiniApp/src/hooks/index.ts b/apps/housekeepingMiniApp/src/hooks/index.ts
index 9b813dd..1dc4146 100644
--- a/apps/housekeepingMiniApp/src/hooks/index.ts
+++ b/apps/housekeepingMiniApp/src/hooks/index.ts
@@ -5,3 +5,4 @@
export * from './authentication';
export * from './app';
export * from './enterprise';
+export * from './openStandardServices';
diff --git a/apps/housekeepingMiniApp/src/hooks/openStandardServices.ts b/apps/housekeepingMiniApp/src/hooks/openStandardServices.ts
new file mode 100644
index 0000000..466b23b
--- /dev/null
+++ b/apps/housekeepingMiniApp/src/hooks/openStandardServices.ts
@@ -0,0 +1,38 @@
+import { EnumPagedListOrder } from '@12333/constants';
+import { useInfiniteLoading } from '@12333/hooks';
+import * as standardServiceServices from '@12333/services/apiV2/standardService';
+
+export function useGetOpenStandardServices() {
+ const queryState = reactive({
+ ignoreId: '',
+ jobCode: '',
+ });
+
+ const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
+ ({ pageParam }) => {
+ let params: API.GetStandardServicesQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
+ },
+ ignoreId: queryState.ignoreId,
+ jobCode: queryState.jobCode,
+ };
+
+ return standardServiceServices.getOpenStandardServices(params, {
+ showLoading: false,
+ });
+ },
+ {
+ queryKey: ['standardServiceServices/getOpenStandardServices', queryState],
+ enabled: computed(() => !!queryState.jobCode),
+ }
+ );
+
+ return {
+ queryState,
+ infiniteLoadingProps,
+ invalidateQueries,
+ };
+}
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue
index 0a92480..7f66311 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue
@@ -123,6 +123,7 @@
import IconAttention from '@/assets/flexJob/icon-attention-lg.png';
import IconAttentionActive from '@/assets/flexJob/icon-attention-lg-active.png';
import { EnumPagedListOrder } from '@12333/constants';
+import { useGetOpenStandardServices } from '@/hooks';
defineOptions({
name: 'serciceDetail',
@@ -194,32 +195,7 @@
} catch (error) {}
});
-const queryState = reactive({
- ignoreId: id,
- jobCode: '',
-});
-
-const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
- ({ pageParam }) => {
- let params: API.GetStandardServicesQuery = {
- pageModel: {
- rows: 20,
- page: pageParam,
- orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
- },
- ignoreId: queryState.ignoreId,
- jobCode: queryState.jobCode,
- };
-
- return standardServiceServices.getOpenStandardServices(params, {
- showLoading: false,
- });
- },
- {
- queryKey: ['standardServiceServices/getOpenStandardServices', queryState],
- enabled: computed(() => !!queryState.jobCode),
- }
-);
+const { queryState, infiniteLoadingProps } = useGetOpenStandardServices();
function goSerciceDetail(item: API.GetStandardServicesQueryResultItem) {
Taro.navigateTo({
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 986713e..ada9134 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -5080,6 +5080,10 @@
description?: string;
/** 浠诲姟鍦扮偣鍚嶇О */
addressName?: string;
+ /** 楠屾敹濮撳悕 */
+ receiveName?: string;
+ /** 楠屾敹鑱旂郴鐢佃瘽 */
+ receiveContactPhoneNumber?: string;
server?: GetCheckReceiveTasksQueryResultServer;
/** 鏈嶅姟浜哄憳濮撳悕 */
serverName?: string;
@@ -5153,6 +5157,10 @@
checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
/** 浜哄憳鏁伴噺 */
arrangeUserCount?: number;
+ /** 楠屾敹濮撳悕 */
+ receiveName?: string;
+ /** 楠屾敹鑱旂郴鐢佃瘽 */
+ receiveContactPhoneNumber?: string;
server?: GetCheckReceiveTasksQueryResultServer;
/** 鏈嶅姟浜哄憳濮撳悕 */
serverName?: string;
@@ -5352,6 +5360,10 @@
contacts?: string;
/** 鑱旂郴鐢佃瘽 */
contactPhoneNumber?: string;
+ /** 楠屾敹濮撳悕 */
+ receiveName?: string;
+ /** 楠屾敹鑱旂郴鐢佃瘽 */
+ receiveContactPhoneNumber?: string;
server?: GetCheckReceiveTasksQueryResultServer;
/** 鏈嶅姟浜哄憳濮撳悕 */
serverName?: string;
@@ -8803,6 +8815,10 @@
enterpriseEmployeeId?: string;
applyButton?: GetTaskInfoQueryResultApplyButton;
hireButton?: GetTaskInfoQueryResultHireButton;
+ /** 楠屾敹濮撳悕 */
+ receiveName?: string;
+ /** 楠屾敹鑱旂郴鐢佃瘽 */
+ receiveContactPhoneNumber?: string;
server?: GetCheckReceiveTasksQueryResultServer;
/** 鏈嶅姟浜哄憳濮撳悕 */
serverName?: string;
--
Gitblit v1.10.0