admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Showing only changes of commit 689e93a673 - Show all commits

View File

@ -95,26 +95,37 @@ const listType = computed(() => {
return 'good' return 'good'
}) })
const endpoint = computed(() => { // W12.2 修正: 后端 OpenApiOrderController 只暴露 /openapi/order/list 一个端点,
const map: Record<string, string> = { // 旧路径 (/order/ordergood/page 等) 404。所有 5 种订单类型都走统一端点。
good: '/order/ordergood/page', const endpoint = computed(() => '/sys/openapi/order/list')
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'
})
async function load() { async function load() {
loading.value = true loading.value = true
error.value = null error.value = null
try { try {
const r: any = await httpGet(endpoint.value, { page: page.value, limit: limit.value, ...filters }) const r: any = await httpGet(endpoint.value, { page: page.value, limit: limit.value })
let rows: Order[] = (r?.data?.list || []).map((it: any) => ({ ...it, raw: it })) 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 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) { } catch (e: any) {
error.value = e?.msg || e?.message || '加载失败' error.value = e?.msg || e?.message || '加载失败'
list.value = FALLBACK list.value = FALLBACK