提交 cf786ac8 作者: 龚洪江

修复:租赁订单,商城订单调整

上级 970d78ac
...@@ -168,7 +168,8 @@ function EquipmentOrderView() { ...@@ -168,7 +168,8 @@ function EquipmentOrderView() {
{ {
title: '商品', title: '商品',
align: 'center', align: 'center',
width: '20%', width: '300px',
fixed: 'left',
render: (_text, record) => ( render: (_text, record) => (
<TableItem <TableItem
tr={ tr={
...@@ -196,7 +197,7 @@ function EquipmentOrderView() { ...@@ -196,7 +197,7 @@ function EquipmentOrderView() {
{ {
title: '租期', title: '租期',
align: 'center', align: 'center',
width: '15%', width: '200px',
render: (_text, record) => ( render: (_text, record) => (
<TableItem <TableItem
tr={ tr={
...@@ -213,10 +214,12 @@ function EquipmentOrderView() { ...@@ -213,10 +214,12 @@ function EquipmentOrderView() {
title: '数量', title: '数量',
align: 'center', align: 'center',
dataIndex: 'wareNum', dataIndex: 'wareNum',
width: 100,
render: (text) => <TableItem tr={text} />, render: (text) => <TableItem tr={text} />,
}, },
{ {
title: '单价', title: '单价',
width: 200,
align: 'center', align: 'center',
dataIndex: 'unitPrice', dataIndex: 'unitPrice',
render: (text) => <TableItem tr={<span>¥{text?.toLocaleString()}</span>} />, render: (text) => <TableItem tr={<span>¥{text?.toLocaleString()}</span>} />,
...@@ -251,7 +254,7 @@ function EquipmentOrderView() { ...@@ -251,7 +254,7 @@ function EquipmentOrderView() {
title: '订单状态', title: '订单状态',
dataIndex: 'statusCode', dataIndex: 'statusCode',
align: 'center', align: 'center',
width: '10%', width: '100px',
render: (text: number) => ( render: (text: number) => (
<TableItem tr={tranStatusList.find((v) => v.value === String(text))?.label} /> <TableItem tr={tranStatusList.find((v) => v.value === String(text))?.label} />
), ),
...@@ -260,7 +263,7 @@ function EquipmentOrderView() { ...@@ -260,7 +263,7 @@ function EquipmentOrderView() {
title: '押金', title: '押金',
dataIndex: 'deposit', dataIndex: 'deposit',
align: 'center', align: 'center',
width: '10%', width: '200px',
render: (text: number, record) => ( render: (text: number, record) => (
<TableItem <TableItem
tr={ tr={
...@@ -287,7 +290,7 @@ function EquipmentOrderView() { ...@@ -287,7 +290,7 @@ function EquipmentOrderView() {
title: '实付款', title: '实付款',
dataIndex: 'orderTotalAmount', dataIndex: 'orderTotalAmount',
align: 'center', align: 'center',
width: '10%', width: '200px',
render: (text, record) => ( render: (text, record) => (
<TableItem <TableItem
tr={ tr={
...@@ -314,6 +317,7 @@ function EquipmentOrderView() { ...@@ -314,6 +317,7 @@ function EquipmentOrderView() {
title: '推荐人', title: '推荐人',
dataIndex: 'userName', dataIndex: 'userName',
align: 'center', align: 'center',
width: 200,
render: (_text, _record) => <TableItem tr={''} />, render: (_text, _record) => <TableItem tr={''} />,
}, },
{ {
......
...@@ -117,11 +117,11 @@ function ProductOrderView() { ...@@ -117,11 +117,11 @@ function ProductOrderView() {
getTableList(); getTableList();
}; };
// 订单状态筛选 // 订单状态筛选
const statusChangeEvent = (i: number) => { const statusChangeEvent = (item: { label: string; value: number }, i: number) => {
pagination.current = 1; pagination.current = 1;
pagination.pageSize = 10; pagination.pageSize = 10;
setStatusCodeButtonIndex(i); setStatusCodeButtonIndex(i);
query = { ...query, statusCode: tranStatusList[i].value }; query = { ...query, statusCode: item.value };
getTableList(); getTableList();
}; };
// 跳转订单详情 // 跳转订单详情
...@@ -231,15 +231,8 @@ function ProductOrderView() { ...@@ -231,15 +231,8 @@ function ProductOrderView() {
title: '订单金额(元)', title: '订单金额(元)',
dataIndex: 'orderTotalAmount', dataIndex: 'orderTotalAmount',
align: 'center', align: 'center',
render: (text) => ( width: 280,
<TableItem tr={<div className='goods-text'>{text?.toLocaleString()}</div>} /> render: (text, record) => (
),
},
{
title: '数量',
align: 'center',
width: '15%',
render: (_text, record) => (
<TableItem <TableItem
td={ td={
<div> <div>
...@@ -247,6 +240,16 @@ function ProductOrderView() { ...@@ -247,6 +240,16 @@ function ProductOrderView() {
<span>{record.createTime}</span> <span>{record.createTime}</span>
</div> </div>
} }
tr={<div className='goods-text'>{text?.toLocaleString()}</div>}
/>
),
},
{
title: '数量',
align: 'center',
width: '100px',
render: (_text, record) => (
<TableItem
tr={record.skuDTOList.map((v) => ( tr={record.skuDTOList.map((v) => (
<div key={v.id} className='goods-text'> <div key={v.id} className='goods-text'>
{v.orderNum} {v.orderNum}
...@@ -258,6 +261,7 @@ function ProductOrderView() { ...@@ -258,6 +261,7 @@ function ProductOrderView() {
{ {
title: '单价', title: '单价',
align: 'center', align: 'center',
width: '200px',
render: (_text, record) => ( render: (_text, record) => (
<TableItem <TableItem
tr={record.skuDTOList.map((v) => ( tr={record.skuDTOList.map((v) => (
...@@ -272,12 +276,14 @@ function ProductOrderView() { ...@@ -272,12 +276,14 @@ function ProductOrderView() {
title: '订单类型', title: '订单类型',
align: 'center', align: 'center',
dataIndex: 'orderType', dataIndex: 'orderType',
width: '100px',
render: (text) => ( render: (text) => (
<TableItem tr={<div className='goods-text'>{text ? '意向订单' : '正常订单'}</div>} /> <TableItem tr={<div className='goods-text'>{text ? '意向订单' : '正常订单'}</div>} />
), ),
}, },
{ {
title: '实际支付', title: '实际支付',
width: '200px',
dataIndex: 'otherAmount', dataIndex: 'otherAmount',
align: 'center', align: 'center',
render: (text) => ( render: (text) => (
...@@ -286,6 +292,7 @@ function ProductOrderView() { ...@@ -286,6 +292,7 @@ function ProductOrderView() {
}, },
{ {
title: '抵扣云享金', title: '抵扣云享金',
width: '200px',
dataIndex: 'shareAmount', dataIndex: 'shareAmount',
align: 'center', align: 'center',
render: (text) => ( render: (text) => (
...@@ -294,6 +301,7 @@ function ProductOrderView() { ...@@ -294,6 +301,7 @@ function ProductOrderView() {
}, },
{ {
title: '抵扣佣金', title: '抵扣佣金',
width: '200px',
dataIndex: 'salaryAmount', dataIndex: 'salaryAmount',
align: 'center', align: 'center',
render: (text) => ( render: (text) => (
...@@ -304,7 +312,7 @@ function ProductOrderView() { ...@@ -304,7 +312,7 @@ function ProductOrderView() {
title: '买家', title: '买家',
dataIndex: 'uid', dataIndex: 'uid',
align: 'center', align: 'center',
width: '10%', width: '200px',
render: (_text: any, record) => ( render: (_text: any, record) => (
<TableItem <TableItem
tr={ tr={
...@@ -333,6 +341,7 @@ function ProductOrderView() { ...@@ -333,6 +341,7 @@ function ProductOrderView() {
title: '订单状态', title: '订单状态',
dataIndex: 'statusCode', dataIndex: 'statusCode',
align: 'center', align: 'center',
width: '100px',
render: (text) => ( render: (text) => (
<TableItem tr={<div>{orderStatusList.find((i) => i.value === text)?.label || text}</div>} /> <TableItem tr={<div>{orderStatusList.find((i) => i.value === text)?.label || text}</div>} />
), ),
...@@ -340,11 +349,13 @@ function ProductOrderView() { ...@@ -340,11 +349,13 @@ function ProductOrderView() {
{ {
title: '推荐人', title: '推荐人',
dataIndex: 'userName', dataIndex: 'userName',
width: '100px',
align: 'center', align: 'center',
render: (_text) => <TableItem tr={<div className='goods-text'>--</div>} />, render: (_text) => <TableItem tr={<div className='goods-text'>--</div>} />,
}, },
{ {
title: '订单交期', title: '订单交期',
width: '100px',
dataIndex: 'deliveryTime', dataIndex: 'deliveryTime',
align: 'center', align: 'center',
render: (text: string) => ( render: (text: string) => (
...@@ -375,7 +386,7 @@ function ProductOrderView() { ...@@ -375,7 +386,7 @@ function ProductOrderView() {
dataIndex: 'action', dataIndex: 'action',
// align: 'right', // align: 'right',
fixed: 'right', fixed: 'right',
width: '10%', width: '100px',
onHeaderCell: () => ({ onHeaderCell: () => ({
style: { style: {
textAlign: 'center', textAlign: 'center',
...@@ -445,7 +456,7 @@ function ProductOrderView() { ...@@ -445,7 +456,7 @@ function ProductOrderView() {
<Button <Button
key={j} key={j}
type={j === statusCodeButtonIndex ? 'primary' : 'default'} type={j === statusCodeButtonIndex ? 'primary' : 'default'}
onClick={() => statusChangeEvent(j)} onClick={() => statusChangeEvent(i, j)}
style={{ marginTop: '5px' }} style={{ marginTop: '5px' }}
> >
{i.label} {i.label}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论