admin_new P0+P1 全批次合并 (84 commits) #2
@ -95,26 +95,37 @@ const listType = computed(() => {
|
||||
return 'good'
|
||||
})
|
||||
|
||||
const endpoint = computed(() => {
|
||||
const map: Record<string, string> = {
|
||||
good: '/order/ordergood/page',
|
||||
service: '/order/serviceorder/page',
|
||||
groupsupplier: '/order/groupsupplierorder/page',
|
||||
groupservice: '/order/groupserviceorder/page',
|
||||
aftersale: '/order/orderafter/page',
|
||||
commission: '/order/ordergood-commission/page'
|
||||
}
|
||||
return map[listType.value] || '/order/ordergood/page'
|
||||
})
|
||||
// W12.2 修正: 后端 OpenApiOrderController 只暴露 /openapi/order/list 一个端点,
|
||||
// 旧路径 (/order/ordergood/page 等) 404。所有 5 种订单类型都走统一端点。
|
||||
const endpoint = computed(() => '/sys/openapi/order/list')
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
error.value = null
|
||||
try {
|
||||
const r: any = await httpGet(endpoint.value, { page: page.value, limit: limit.value, ...filters })
|
||||
let rows: Order[] = (r?.data?.list || []).map((it: any) => ({ ...it, raw: it }))
|
||||
const r: any = await httpGet(endpoint.value, { page: page.value, limit: limit.value })
|
||||
const respList = r?.data?.list || []
|
||||
const rows: Order[] = respList.map((it: any) => ({
|
||||
id: it.orderId || '',
|
||||
orderNo: it.orderId || '',
|
||||
contractCode: '',
|
||||
enterpriseName: '',
|
||||
orderUserName: '',
|
||||
orderType: 1,
|
||||
totalAmount: Number(it.totalAmount ?? 0),
|
||||
totalNum: Number(it.goodsQuantity ?? 0),
|
||||
shippedNum: 0,
|
||||
status: Number(it.status ?? 0),
|
||||
createDate: it.createDate ? String(it.createDate) : '',
|
||||
payDate: null,
|
||||
payType: 0,
|
||||
pickupType: 1,
|
||||
raw: it
|
||||
}))
|
||||
list.value = rows
|
||||
total.value = r?.data?.total || 0
|
||||
// 后端返 total 是 string, 转 number
|
||||
const t = r?.data?.total
|
||||
total.value = typeof t === 'string' ? parseInt(t, 10) : (Number(t) || 0)
|
||||
} catch (e: any) {
|
||||
error.value = e?.msg || e?.message || '加载失败'
|
||||
list.value = FALLBACK
|
||||
|
||||
Loading…
Reference in New Issue
Block a user