diff --git a/erp-frontend-vue/src/api/salesOrder.ts b/erp-frontend-vue/src/api/salesOrder.ts index cbb4b82..11e3489 100644 --- a/erp-frontend-vue/src/api/salesOrder.ts +++ b/erp-frontend-vue/src/api/salesOrder.ts @@ -158,10 +158,20 @@ export const BIZ_STATUS_OPTIONS = [ const BASE = '/erp/sl/order' +/** 将列表行数据做字段别名映射 */ +function normalizeOrderRow(row: any): any { + return { + ...row, + salesmanId: row.salesmanId ?? row.salesUserId, + salesmanName: row.salesmanName ?? row.salesUserName ?? '', + salesType: row.salesType ?? row.saleType ?? '', + } +} + /** 获取销售订单列表(单据视图) */ export function getSalesOrderList(params: SalesOrderQuery): Promise { return request.get(`${BASE}/list`, { params }).then((res: any) => { - const rows = res.rows ?? res.data?.rows ?? [] + const rows = (res.rows ?? res.data?.rows ?? []).map(normalizeOrderRow) const total = res.total ?? res.data?.total ?? 0 return { list: rows, total } }) @@ -170,7 +180,7 @@ export function getSalesOrderList(params: SalesOrderQuery): Promise { return request.get(`${BASE}/lineList`, { params }).then((res: any) => { - const rows = res.rows ?? res.data?.rows ?? [] + const rows = (res.rows ?? res.data?.rows ?? []).map(normalizeOrderRow) const total = res.total ?? res.data?.total ?? 0 return { list: rows, total } }) @@ -187,6 +197,11 @@ export function getSalesOrderDetail(orderId: number): Promise { // 后端返回 salesUserId/salesUserName,前端表单使用 salesmanId/salesmanName,便于下拉回显 if (data.salesUserId !== undefined) data.salesmanId = data.salesUserId if (data.salesUserName !== undefined) data.salesmanName = data.salesUserName + // 审核信息字段别名映射(后端可能使用 checkBy/checkDate 等命名) + // 使用 == null 而非 ! 判断,避免 auditorId=0 或 auditorName='' 被误判为缺失 + if (data.auditorId == null) data.auditorId = data.checkUserId ?? data.checkById ?? data.auditById + if (data.auditorName == null) data.auditorName = data.checkUserName ?? data.checkByName ?? data.auditByName ?? data.auditUser + if (data.auditDate == null) data.auditDate = data.checkDate ?? data.auditTime ?? data.checkTime return data }) } diff --git a/erp-frontend-vue/src/router/index.ts b/erp-frontend-vue/src/router/index.ts index 028fba3..089f0ee 100644 --- a/erp-frontend-vue/src/router/index.ts +++ b/erp-frontend-vue/src/router/index.ts @@ -79,7 +79,7 @@ const routes: RouteRecordRaw[] = [ { path: 'order/progress/:id', name: 'SalesOrderProgress', - component: () => import('@/views/Sales/Order/index.vue'), + component: () => import('@/views/Sales/Order/Progress.vue'), meta: { title: '生产进度' } }, { diff --git a/erp-frontend-vue/src/views/Sales/Order/Progress.vue b/erp-frontend-vue/src/views/Sales/Order/Progress.vue new file mode 100644 index 0000000..a0cae0f --- /dev/null +++ b/erp-frontend-vue/src/views/Sales/Order/Progress.vue @@ -0,0 +1,216 @@ + + + + + diff --git a/erp-frontend-vue/src/views/Sales/Order/form.vue b/erp-frontend-vue/src/views/Sales/Order/form.vue index 2bb93c3..57f5326 100644 --- a/erp-frontend-vue/src/views/Sales/Order/form.vue +++ b/erp-frontend-vue/src/views/Sales/Order/form.vue @@ -144,7 +144,7 @@ @@ -318,7 +318,7 @@ empty-text="暂无物料明细,请点击上方按钮添加物料" > - +