some edits

This commit is contained in:
2026-08-06 17:12:28 +03:30
parent 4411443fba
commit 43ebebd8c4
41 changed files with 5887 additions and 865 deletions
+48 -26
View File
@@ -1,8 +1,8 @@
import { computed, inject, provide, reactive, ref, type InjectionKey } from 'vue'
import { computed, inject, onMounted, provide, reactive, ref, type InjectionKey } from 'vue'
import { useRouter } from 'vue-router'
import { companies, orders as initialOrders } from '@/data/mockData'
import { generateOrderNumber } from '@/utils/format'
import type { Order, SettlementMethod } from '@/types'
import { companiesApi, mapAdminOrder, ordersApi } from '@/services/api'
import { ApiError } from '@/services/http'
import type { Company, Order, SettlementMethod } from '@/types'
import { useToast } from '@/composables/useToast'
@@ -10,7 +10,8 @@ export function useOrdersPage() {
const router = useRouter()
const toast = useToast()
const orderList = ref<Order[]>([...initialOrders])
const companies = ref<Company[]>([])
const orderList = ref<Order[]>([])
const activeTab = ref('all')
const selectedOrderId = ref<string>('')
const searchQuery = ref('')
@@ -18,10 +19,11 @@ export function useOrdersPage() {
const showDetailPanel = ref(false)
const showDetailModal = ref(false)
const formError = ref('')
const saving = ref(false)
const emptyForm = () => ({
customerName: '',
companyId: companies[0]?.id ?? '',
companyId: companies.value[0]?.id ?? '',
settlementMethod: 'check' as SettlementMethod,
meterage: 1000,
customerPhone: '',
@@ -51,6 +53,26 @@ export function useOrdersPage() {
orderList.value.find((o) => o.id === selectedOrderId.value) ?? null,
)
async function loadData() {
try {
const [ordersData, companiesData] = await Promise.all([
ordersApi.list(),
companiesApi.list(),
])
orderList.value = ordersData.map((o) => mapAdminOrder(o) as Order)
companies.value = companiesData
if (!form.companyId && companiesData[0]) {
form.companyId = companiesData[0].id
}
} catch (err) {
toast.error(err instanceof ApiError ? err.message : 'بارگذاری سفارش‌ها انجام نشد.')
}
}
onMounted(() => {
void loadData()
})
function selectOrder(order: Order, openDetail = false) {
selectedOrderId.value = order.id
if (openDetail) {
@@ -94,32 +116,31 @@ export function useOrdersPage() {
formError.value = ''
}
function submitAddOrder() {
async function submitAddOrder() {
if (!isFormValid.value) {
formError.value = 'نام مشتری و شرکت الزامی هستند.'
return
}
const company = companies.find((c) => c.id === form.companyId)
const newOrder: Order = {
id: `ord-${crypto.randomUUID().slice(0, 8)}`,
orderNumber: generateOrderNumber(),
customerName: form.customerName.trim(),
companyName: company?.name ?? '—',
companyId: form.companyId,
settlementMethod: form.settlementMethod,
totalAmount: null,
meterage: form.meterage,
status: 'pending_review',
createdAt: new Date().toISOString(),
customerPhone: form.customerPhone.trim() || undefined,
items: [],
saving.value = true
try {
const created = await ordersApi.create({
companyId: form.companyId,
customerName: form.customerName.trim(),
customerPhone: form.customerPhone.trim() || undefined,
settlementMethod: form.settlementMethod,
meterage: form.meterage,
})
const mapped = mapAdminOrder(created) as Order
orderList.value.unshift(mapped)
selectedOrderId.value = mapped.id
toast.success('سفارش جدید ثبت شد.')
closeAddModal()
} catch (err) {
toast.error(err instanceof ApiError ? err.message : 'ثبت سفارش انجام نشد.')
} finally {
saving.value = false
}
orderList.value.unshift(newOrder)
selectedOrderId.value = newOrder.id
toast.success('سفارش جدید ثبت شد.')
closeAddModal()
}
return {
@@ -146,6 +167,7 @@ export function useOrdersPage() {
openAddModal,
closeAddModal,
submitAddOrder,
saving,
}
}