Commit 814c8319 authored by XieZhiXiong's avatar XieZhiXiong

chore: 完善展示

parent a3667db1
......@@ -203,88 +203,73 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{
title: '商品ID',
dataIndex: 'productId',
align: 'center',
},
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
align: 'center',
},
{
title: '品牌',
dataIndex: 'brand',
align: 'center',
},
{
title: '单位',
dataIndex: 'unit',
align: 'center',
}
]
: [
{
title: '物料编号',
dataIndex: 'materielNo',
align: 'center',
dataIndex: 'productId',
},
{
title: '物料名称、规格',
dataIndex: 'materielName',
align: 'center',
render: (text, record) => `${text}/${record.materielType}`,
dataIndex: 'productName',
render: (text, record) => `${text}${record.type ? '/' + record.type : ''}`,
},
{
title: '品类',
dataIndex: 'materielCategory',
align: 'center',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'materielBrand',
align: 'center',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'materielUnit',
align: 'center',
dataIndex: 'unit',
},
{
title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'productId',
align: 'center',
render: (text, record) => `${text}/${record.productName}/${record.category}/${record.brand}`,
dataIndex: 'associatedProductId',
render: (text, record) => `${text}/${record.associatedProductName}/${record.associatedType || '无'}/${record.associatedCategory}/${record.associatedBrand}`,
},
]
),
{
title: !isPointsOrder ? '采购数量' : '兑换数量',
dataIndex: 'purchaseCount',
align: 'center',
},
{
title: !isPointsOrder ? '采购单价' : '所需积分',
dataIndex: 'purchasePrice',
align: 'center',
},
{
title: !isPointsOrder ? '采购金额' : '所需积分小计',
dataIndex: 'purchaseAmount',
align: 'center',
},
{
title: '换货数量',
dataIndex: 'replaceCount',
align: 'center',
},
{
title: '换货原因',
dataIndex: 'replaceReason',
align: 'center',
},
{
title: (
......@@ -296,7 +281,6 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
</>
),
dataIndex: 'needReplaceName',
align: 'center',
render: (text, record) => (
<>
{!isEditReturn ? (
......
......@@ -251,7 +251,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
].filter(Boolean) as ColumnType<any>[];
const childTableColumn: ColumnType<any>[] = [
!isMateriel ?{
!isMateriel ? {
title: '商品ID',
dataIndex: 'productNo',
} : {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment