Fix order detail routing and loading
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<script setup lang="ts">
|
||||
import { useQuery } from '@vue/apollo-composable';
|
||||
import {
|
||||
MyOrdersDocument,
|
||||
type MyOrdersQuery,
|
||||
OrderDetailDocument,
|
||||
type OrderDetailQuery,
|
||||
} from '~/composables/graphql/generated';
|
||||
import {
|
||||
orderLogisticsStateText,
|
||||
@@ -10,14 +10,16 @@ import {
|
||||
orderLineStateText,
|
||||
} from '~/composables/useOrderDetailPresentation';
|
||||
|
||||
type OrderItem = MyOrdersQuery['myOrders'][number];
|
||||
type OrderItem = NonNullable<OrderDetailQuery['order']>;
|
||||
|
||||
const route = useRoute();
|
||||
const orderId = computed(() => String(route.params.id || ''));
|
||||
const ordersQuery = useQuery(MyOrdersDocument);
|
||||
const orderQuery = useQuery(OrderDetailDocument, () => ({
|
||||
id: orderId.value,
|
||||
}));
|
||||
|
||||
const currentOrder = computed<OrderItem | null>(() =>
|
||||
(ordersQuery.result.value?.myOrders ?? []).find((item: OrderItem) => item.id === orderId.value) ?? null,
|
||||
orderQuery.result.value?.order ?? null,
|
||||
);
|
||||
</script>
|
||||
|
||||
@@ -25,7 +27,7 @@ const currentOrder = computed<OrderItem | null>(() =>
|
||||
<section class="space-y-6">
|
||||
<NuxtLink to="/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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user