From bc4123e91c5a23ddc2fdc07d9b72290de33d1cd6 Mon Sep 17 00:00:00 2001 From: safavimohadeseh78 Date: Sat, 15 Aug 2026 08:52:58 +0200 Subject: [PATCH] Show per-item company on multi-company order pricing and detail. Co-authored-by: Cursor --- src/types/index.ts | 2 ++ src/views/orders/OrderPricingView.vue | 9 +++++++++ src/views/orders/components/OrderDetailContent.vue | 3 +++ 3 files changed, 14 insertions(+) diff --git a/src/types/index.ts b/src/types/index.ts index db1444b..c8d8590 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -76,6 +76,8 @@ export interface OrderItem { confirmedMeterage: number | null supplyPrice: number | null totalAmount: number | null + companyId?: string + companyName?: string } export interface Order { diff --git a/src/views/orders/OrderPricingView.vue b/src/views/orders/OrderPricingView.vue index e659ddf..1d4e1e1 100644 --- a/src/views/orders/OrderPricingView.vue +++ b/src/views/orders/OrderPricingView.vue @@ -71,6 +71,8 @@ async function loadOrder() { confirmedMeterage: item.confirmedMeterage, supplyPrice: item.supplyPrice, totalAmount: item.totalAmount, + companyId: item.companyId, + companyName: item.companyName, })) shippingCost.value = data.shippingCost ?? 0 } catch (err) { @@ -129,6 +131,8 @@ function submitAddProduct() { confirmedMeterage: form.confirmedMeterage || form.requestedMeterage, supplyPrice: null, totalAmount: null, + companyId: order.value?.companyId, + companyName: order.value?.companyName, }) closeAddModal() @@ -163,6 +167,8 @@ async function savePricing() { confirmedMeterage: item.confirmedMeterage, supplyPrice: item.supplyPrice, totalAmount: item.totalAmount, + companyId: item.companyId, + companyName: item.companyName, })) toast.success('قیمت‌گذاری ذخیره شد.') } catch (err) { @@ -270,6 +276,7 @@ async function sendInvoice() { ردیف + شرکت کالیته محصول رنگ / نوع @@ -283,6 +290,7 @@ async function sendInvoice() { {{ index + 1 }} + {{ item.companyName || order?.companyName || '—' }} {{ item.catalogCode }} {{ item.productName }} {{ item.color }} @@ -328,6 +336,7 @@ async function sendInvoice() { #{{ index + 1 }}
+ {{ item.companyName || order?.companyName }} کالیته {{ item.catalogCode }} {{ item.color }} درخواست: {{ formatNumber(item.requestedMeterage) }} متر diff --git a/src/views/orders/components/OrderDetailContent.vue b/src/views/orders/components/OrderDetailContent.vue index 7b4da96..1b2a1b7 100644 --- a/src/views/orders/components/OrderDetailContent.vue +++ b/src/views/orders/components/OrderDetailContent.vue @@ -213,6 +213,7 @@ function submitStatus() { + @@ -223,6 +224,7 @@ function submitStatus() { + @@ -241,6 +243,7 @@ function submitStatus() { {{ item.catalogCode }}
+ {{ item.companyName }} {{ item.color }} {{ formatMeterage(item.confirmedMeterage ?? item.requestedMeterage) }} {{ formatCurrency(item.supplyPrice) }}
شرکت کالیته محصول رنگ
{{ item.companyName || order.companyName }} {{ item.catalogCode }} {{ item.productName }} {{ item.color }}