Commit 668da7aa authored by XieZhiXiong's avatar XieZhiXiong

chore: 修改srm订单字段相关

parent 69abb674
......@@ -147,7 +147,6 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{
title: '商品ID',
dataIndex: 'productId',
align: 'center',
},
{
title: '商品名称',
......@@ -157,51 +156,42 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{
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}`,
},
]
),
......
......@@ -173,7 +173,6 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{
title: '商品ID',
dataIndex: 'productId',
align: 'center',
},
{
title: '商品名称',
......@@ -183,51 +182,42 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{
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}`,
},
]
),
......
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