修复一些错误
This commit is contained in:
@@ -38,6 +38,42 @@ export interface IStoreOrderItemUpdate {
|
||||
remark: string;
|
||||
}
|
||||
|
||||
/** 订单关联账单(列表附带摘要、详情附带完整字段;pay_state 由后端推导) */
|
||||
export interface IStoreOrderBill {
|
||||
id: number;
|
||||
bill_no: string;
|
||||
bill_date?: string;
|
||||
/** 商品金额 */
|
||||
product_amount?: string;
|
||||
/** 配送费 */
|
||||
delivery_fee?: string;
|
||||
box_num?: number;
|
||||
tray_num?: number;
|
||||
box_price?: string;
|
||||
tray_price?: string;
|
||||
/** 附加金额 = 筐×筐单价 + 托盘×托盘单价 */
|
||||
added_amount?: string;
|
||||
/** 账单总金额 */
|
||||
total_amount: string;
|
||||
/** 支付状态:0未支付 1已支付 */
|
||||
status: number;
|
||||
/** 关联支付记录ID(0=未发起支付) */
|
||||
payment_id?: number;
|
||||
/** 支付进度:0待支付 1审核中 2已支付 */
|
||||
pay_state?: number;
|
||||
pay_state_name?: string;
|
||||
paid_at?: string | null;
|
||||
pay_remark?: string;
|
||||
created_at?: string;
|
||||
}
|
||||
|
||||
/** 账单支付进度映射(与小程序端口径一致) */
|
||||
export const BILL_PAY_STATE_MAP: Record<number, { text: string; color: string }> = {
|
||||
0: { text: '待支付', color: 'warning' },
|
||||
1: { text: '审核中', color: 'processing' },
|
||||
2: { text: '已支付', color: 'success' },
|
||||
};
|
||||
|
||||
/** 门店订单 */
|
||||
export default interface IStoreOrder {
|
||||
id?: number;
|
||||
@@ -46,6 +82,8 @@ export default interface IStoreOrder {
|
||||
purchase_id?: number;
|
||||
/** 关联账单ID(采购单完成后按门店生成账单时回写) */
|
||||
bill_id?: number;
|
||||
/** 关联账单(生成账单后由接口附带) */
|
||||
bill?: IStoreOrderBill | null;
|
||||
store?: {
|
||||
id: number;
|
||||
name: string;
|
||||
|
||||
@@ -23,7 +23,7 @@ import type {
|
||||
XinTableProps,
|
||||
} from '@/components/XinTable/typings.ts';
|
||||
import type IStoreOrder from '@/domain/iStoreOrder.ts';
|
||||
import { STORE_ORDER_STATUS_MAP } from '@/domain/iStoreOrder.ts';
|
||||
import { BILL_PAY_STATE_MAP, STORE_ORDER_STATUS_MAP } from '@/domain/iStoreOrder.ts';
|
||||
import {
|
||||
getStoreOrder,
|
||||
updateOrderStatus,
|
||||
@@ -312,10 +312,29 @@ const StoreOrderPage: React.FC = () => {
|
||||
) : '-'
|
||||
},
|
||||
{
|
||||
title: '账单ID',
|
||||
title: '账单信息',
|
||||
dataIndex: 'bill_id',
|
||||
valueType: 'digit',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
width: 240,
|
||||
render: (_, record) => record.bill ? (
|
||||
<Space orientation={'vertical'}>
|
||||
<div>
|
||||
<Text type={'secondary'}>账单号:</Text>
|
||||
{record.bill.bill_no}
|
||||
</div>
|
||||
<div>
|
||||
<Text type={'secondary'}>支付状态:</Text>
|
||||
<Tag color={BILL_PAY_STATE_MAP[record.bill.pay_state ?? 0]?.color}>
|
||||
{record.bill.pay_state_name ?? BILL_PAY_STATE_MAP[record.bill.pay_state ?? 0]?.text}
|
||||
</Tag>
|
||||
</div>
|
||||
<div>
|
||||
<Text type={'secondary'}>账单金额:</Text>
|
||||
<span className={'text-[red]'}>{record.bill.total_amount} ¥</span>
|
||||
</div>
|
||||
</Space>
|
||||
) : '-'
|
||||
},
|
||||
{
|
||||
title: '操作栏',
|
||||
@@ -495,6 +514,32 @@ const StoreOrderPage: React.FC = () => {
|
||||
) : null}
|
||||
</Descriptions>
|
||||
|
||||
{/* 关联账单信息(生成账单后展示) */}
|
||||
{detail.bill ? (
|
||||
<Descriptions title="账单信息" column={3} size="small" bordered className="mt-4!">
|
||||
<Descriptions.Item label="账单号">{detail.bill.bill_no}</Descriptions.Item>
|
||||
<Descriptions.Item label="账单日期">{detail.bill.bill_date ?? '-'}</Descriptions.Item>
|
||||
<Descriptions.Item label="支付状态">
|
||||
<Tag color={BILL_PAY_STATE_MAP[detail.bill.pay_state ?? 0]?.color}>
|
||||
{detail.bill.pay_state_name ?? BILL_PAY_STATE_MAP[detail.bill.pay_state ?? 0]?.text}
|
||||
</Tag>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="商品金额">¥{detail.bill.product_amount ?? '-'}</Descriptions.Item>
|
||||
<Descriptions.Item label="配送费">¥{detail.bill.delivery_fee ?? '-'}</Descriptions.Item>
|
||||
<Descriptions.Item label="附加金额">
|
||||
¥{detail.bill.added_amount ?? '0.00'}
|
||||
<Text type={'secondary'} className={'ml-1 text-[12px]'}>
|
||||
(筐{detail.bill.box_num ?? 0}/托盘{detail.bill.tray_num ?? 0})
|
||||
</Text>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="账单总金额">
|
||||
<Text strong className={'text-[red]'}>¥{detail.bill.total_amount}</Text>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="付款时间">{detail.bill.paid_at ?? '-'}</Descriptions.Item>
|
||||
<Descriptions.Item label="付款备注">{detail.bill.pay_remark || '-'}</Descriptions.Item>
|
||||
</Descriptions>
|
||||
) : null}
|
||||
|
||||
{/* 商品明细(商城模式:首图 + 单价 × 订货量 + 金额) */}
|
||||
<Title level={5} className="mt-6! mb-3!">
|
||||
商品明细
|
||||
|
||||
Reference in New Issue
Block a user