Commit c83d3ab8 authored by FE-安焕焕's avatar FE-安焕焕 👣

修复样式问题

parent 0f1a01df
...@@ -28,7 +28,7 @@ const TableList = props => { ...@@ -28,7 +28,7 @@ const TableList = props => {
<td <td
className={[ className={[
'tableContent', 'tableContent',
index < record.mchOrderSkuVoList.length - 1 ? 'border' : null, index < record?.mchOrderSkuVoList?.length - 1 ? 'border' : null,
].join(' ')} ].join(' ')}
> >
{item[key]} {item[key]}
...@@ -100,7 +100,7 @@ const TableList = props => { ...@@ -100,7 +100,7 @@ const TableList = props => {
title: '商品规格', title: '商品规格',
dataIndex: 'skuAttr', dataIndex: 'skuAttr',
key: 'skuAttr', key: 'skuAttr',
width: 100, width: 200,
className: 'colStyle', className: 'colStyle',
hideInSearch: true, hideInSearch: true,
render: (_, record) => renderContent(record, 'skuAttr'), render: (_, record) => renderContent(record, 'skuAttr'),
...@@ -136,7 +136,7 @@ const TableList = props => { ...@@ -136,7 +136,7 @@ const TableList = props => {
title: '订单状态', title: '订单状态',
dataIndex: 'orderStatus', dataIndex: 'orderStatus',
key: 'orderStatus', key: 'orderStatus',
width: 100, width: 120,
hideInSearch: true, hideInSearch: true,
valueEnum: { valueEnum: {
12: '待发货', 12: '待发货',
...@@ -167,21 +167,21 @@ const TableList = props => { ...@@ -167,21 +167,21 @@ const TableList = props => {
fixed: 'right', fixed: 'right',
render: (_, record) => ( render: (_, record) => (
<React.Fragment> <React.Fragment>
{ShowUpdateBtn.includes(record.skuSource.value) ? null : ( {ShowUpdateBtn.includes(record?.skuSource?.value) ? null : (
<Button <Button
type="primary" type="primary"
style={{ style={{
marginBottom: '10px', marginBottom: '10px',
}} }}
onClick={async () => { onClick={async () => {
const skuListData = await getGoods(record.orderId); const skuListData = await getGoods(record?.orderId);
let logisticsData = [{}]; let logisticsData = [{}];
setSkuList(skuListData); setSkuList(skuListData);
const data = await getLogistics(record.orderId); const data = await getLogistics(record?.orderId);
logisticsData = data.map(item => ({ logisticsData = data.map(item => ({
selectedGoods: item.skus.map(sku => sku.orderSkuId), selectedGoods: item?.skus?.map(sku => sku?.orderSkuId),
selectedCompany: `${item.expressCompanyCode}-${item.expressCompanyName}`, selectedCompany: `${item?.expressCompanyCode}-${item?.expressCompanyName}`,
orderNum: item.deliveryNo, orderNum: item?.deliveryNo,
})); }));
setLogisticsData(logisticsData); setLogisticsData(logisticsData);
handleModalVisible(true); handleModalVisible(true);
......
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