Fix order detail routing and loading

This commit is contained in:
Ruslan Bakiev
2026-04-04 13:45:39 +07:00
parent 4fe3f72579
commit 2a5e38f488
6 changed files with 98 additions and 13 deletions

View File

@@ -4,10 +4,10 @@ import {
BlockOrderDocument,
CompleteOrderDocument,
ManagerFinalizeOrderDocument,
ManagerOrdersDocument,
ManagerSetOrderOfferDocument,
OrderDetailDocument,
StartOrderWorkDocument,
type ManagerOrdersQuery,
type OrderDetailQuery,
} from '~/composables/graphql/generated';
import {
formatPrice,
@@ -23,9 +23,11 @@ definePageMeta({
const route = useRoute();
const orderId = computed(() => String(route.params.id || ''));
type ManagerOrderItem = ManagerOrdersQuery['managerOrders'][number];
type ManagerOrderItem = NonNullable<OrderDetailQuery['order']>;
const ordersQuery = useQuery(ManagerOrdersDocument, { status: null });
const orderQuery = useQuery(OrderDetailDocument, () => ({
id: orderId.value,
}));
const finalizeMutation = useMutation(ManagerFinalizeOrderDocument);
const blockMutation = useMutation(BlockOrderDocument);
@@ -38,7 +40,7 @@ const deliveryTermsDraft = ref('');
const deliveryFeeDraft = ref('');
const currentOrder = computed<ManagerOrderItem | null>(() =>
(ordersQuery.result.value?.managerOrders ?? []).find((item: ManagerOrderItem) => item.id === orderId.value) ?? null,
orderQuery.result.value?.order ?? null,
);
watch(
@@ -120,7 +122,7 @@ const offerTotal = computed(() => {
});
async function refetchOrder() {
await ordersQuery.refetch({ status: null });
await orderQuery.refetch({ id: orderId.value });
}
async function saveOffer() {
@@ -197,7 +199,7 @@ async function completeOrder() {
<section class="space-y-6">
<NuxtLink to="/client-orders" class="text-sm font-semibold text-[#0d854a]"> Назад к заказам клиентов</NuxtLink>
<div v-if="ordersQuery.loading.value" class="manager-empty-state">
<div v-if="orderQuery.loading.value" class="manager-empty-state">
Загружаем заказ...
</div>