Commit 610dbe83 authored by guang.wu's avatar guang.wu

feat: 处理收货人手机显示逻辑

parent ffdda113
...@@ -33,7 +33,7 @@ const ChangeLog = props => { ...@@ -33,7 +33,7 @@ const ChangeLog = props => {
props.visible && ( props.visible && (
<Modal <Modal
open={props.visible} open={props.visible}
width={800} width={840}
onCancel={() => closeModal(false)} onCancel={() => closeModal(false)}
footer={[ footer={[
<Button key="close" onClick={() => closeModal(false)}> <Button key="close" onClick={() => closeModal(false)}>
......
...@@ -82,11 +82,7 @@ export const logColumn = [ ...@@ -82,11 +82,7 @@ export const logColumn = [
title: '操作人', title: '操作人',
dataIndex: 'orderNo', dataIndex: 'orderNo',
key: 'orderNo', key: 'orderNo',
width: 200, width: 240,
render: (text, record) => ( render: (text, record) => <div>{record?.operator}</div>,
<div>
{record?.operator} {record?.operateTypeDesc}
</div>
),
}, },
]; ];
...@@ -467,7 +467,8 @@ const TableList = props => { ...@@ -467,7 +467,8 @@ const TableList = props => {
{props.type === 2 ? '更新物流信息' : '填写物流信息'} {props.type === 2 ? '更新物流信息' : '填写物流信息'}
</Button> </Button>
)} )}
{canEditable && ShowUpdateBtn.includes(record?.skuSource?.value) ? null : ( {(canEditable && ShowUpdateBtn.includes(record?.skuSource?.value)) ||
props.type !== 2 ? null : (
<Button <Button
type="primary" type="primary"
style={{ style={{
......
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