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
---
packages/hooks/standardOrder.ts | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/packages/hooks/standardOrder.ts b/packages/hooks/standardOrder.ts
index b241843..ecdb491 100644
--- a/packages/hooks/standardOrder.ts
+++ b/packages/hooks/standardOrder.ts
@@ -4,7 +4,13 @@
import { computed, MaybeRef, reactive, unref } from 'vue';
import { groupBy } from 'lodash';
import { useInfiniteLoading } from '@12333/hooks';
-import { EnumStandardOrderAppointmentStatus, EnumStandardOrderPayStatus } from '@12333/constants';
+import {
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
+ EnumGetStandardOrdersQueryScene,
+ EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus,
+ EnumStandardOrderAppointmentStatus,
+ EnumStandardOrderPayStatus,
+} from '@12333/constants';
type UseStandardServiceDetailOptions = {
id: MaybeRef<string>;
@@ -13,13 +19,13 @@
export function useStandardServiceDetail({ id, onSuccess }: UseStandardServiceDetailOptions) {
const { data, refetch, isLoading, isError } = useQuery({
- queryKey: ['standardServiceServices/getStandardService', id],
+ queryKey: ['standardServiceServices/getOpenStandardService', id],
queryFn: async () => {
let params: API.APIgetStandardServiceParams = {
id: unref(id),
};
- return await standardServiceServices.getStandardService(params, {
+ return await standardServiceServices.getOpenStandardService(params, {
showLoading: false,
});
},
@@ -30,11 +36,12 @@
});
const minPrice = computed(() => {
- if (!data.value?.specs?.length) {
- return 0;
- } else {
- return Math.min(...data.value.specs.map((x) => x.price));
- }
+ // if (!data.value?.specs?.length) {
+ // return 0;
+ // } else {
+ // return Math.min(...data.value.specs.map((x) => x.price));
+ // }
+ return data.value?.minSpecPrice ?? 0;
});
return {
@@ -103,6 +110,9 @@
const queryState = reactive({
appointmentStatus: 0 as any as EnumStandardOrderAppointmentStatus,
payStatus: 0 as any as EnumStandardOrderPayStatus,
+ partAEnterpriseOrderStatus: 0 as any as EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
+ supplierEnterpriseOrderStatus:
+ 0 as any as EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus,
});
const { infiniteLoadingProps } = useInfiniteLoading(
@@ -120,6 +130,12 @@
if (queryState.payStatus) {
params.payStatus = queryState.payStatus;
}
+ if (queryState.partAEnterpriseOrderStatus) {
+ params.partAEnterpriseOrderStatus = queryState.partAEnterpriseOrderStatus;
+ }
+ if (queryState.supplierEnterpriseOrderStatus) {
+ params.supplierEnterpriseOrderStatus = queryState.supplierEnterpriseOrderStatus;
+ }
return standardOrderServices.getStandardOrders(params, {
showLoading: false,
@@ -138,20 +154,28 @@
type UseStandardOrderOptions = {
id: MaybeRef<string>;
+ scene?: EnumGetStandardOrdersQueryScene;
onSuccess?: (data: API.GetStandardOrderQueryResult) => any;
+ refetchInterval?: MaybeRef<number | false>;
};
-export function useStandardOrder({ id, onSuccess }: UseStandardOrderOptions) {
+export function useStandardOrder({
+ id,
+ scene,
+ onSuccess,
+ refetchInterval = false,
+}: UseStandardOrderOptions) {
const {
isLoading,
isError,
data: detail,
refetch,
} = useQuery({
- queryKey: ['standardOrderServices/getStandardOrder', id],
+ queryKey: ['standardOrderServices/getStandardOrder', id, scene],
queryFn: async () => {
const params: API.APIgetStandardOrderParams = {
id: unref(id),
+ scene: scene,
};
return await standardOrderServices.getStandardOrder(params, {
showLoading: false,
@@ -161,6 +185,7 @@
onSuccess(data) {
onSuccess?.(data);
},
+ refetchInterval: unref(refetchInterval),
});
return { detail, isLoading, isError, refetch };
--
Gitblit v1.10.0