改名
This commit is contained in:
parent
db9b387738
commit
8242edbfeb
@ -467,7 +467,7 @@ export default function TrademarkMall() {
|
|||||||
|
|
||||||
|
|
||||||
}}>{
|
}}>{
|
||||||
record.trademarkStatus == '2' || record.trademarkStatus == '3'|| record.trademarkStatus == '4' || record.trademarkStatus == '5'|| record.trademarkStatus == '6'|| record.trademarkStatus == '7'|| record.trademarkStatus == '8'|| record.trademarkStatus == '9'? '查看' : '编辑'
|
record.trademarkStatus == '2' || record.trademarkStatus == '3' || record.trademarkStatus == '4' || record.trademarkStatus == '5' || record.trademarkStatus == '6' || record.trademarkStatus == '7' || record.trademarkStatus == '8' || record.trademarkStatus == '9' ? '查看' : '编辑'
|
||||||
}
|
}
|
||||||
</span>
|
</span>
|
||||||
<span style={{
|
<span style={{
|
||||||
@ -600,7 +600,7 @@ export default function TrademarkMall() {
|
|||||||
title: '当前进度',
|
title: '当前进度',
|
||||||
dataIndex: 'correctionStatus',
|
dataIndex: 'correctionStatus',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 100,
|
width: 120,
|
||||||
render: (text) => (
|
render: (text) => (
|
||||||
<>
|
<>
|
||||||
|
|
||||||
@ -614,11 +614,11 @@ export default function TrademarkMall() {
|
|||||||
dataIndex: 'buyId',
|
dataIndex: 'buyId',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 100,
|
width: 100,
|
||||||
render: (text) => (
|
render: (text,record) => (
|
||||||
<>
|
<>
|
||||||
|
|
||||||
<span style={{ color: '#DD0000', fontSize: '16px', fontWeight: '700', display: text == '' ? 'unset' : 'none' }}>待补充</span>
|
<span style={{ color: '#DD0000', fontSize: '16px', fontWeight: '700', display: text == '' ? 'unset' : 'none' }}>{record.correctionReply=='0'?'未读':'待补充'}</span>
|
||||||
<span style={{ color: 'green', fontSize: '16px', fontWeight: '700', display: text == '' ? 'none' : 'unset' }}>已补充</span>
|
<span style={{ color: 'green', fontSize: '16px', fontWeight: '700', display: text == '' ? 'none' : 'unset' }}>{record.correctionReply=='0'?'已读':'已补充'}</span>
|
||||||
{/* <span> {text == '4' ? '不予受理' : text == '5' ? '已受理' : text == '6' ? '已发初审公告' : text == '7' ? '部分驳回' : text == '8' ? '全部驳回' : text == '9' ? '商标注册完成' : "未知"}</span> */}
|
{/* <span> {text == '4' ? '不予受理' : text == '5' ? '已受理' : text == '6' ? '已发初审公告' : text == '7' ? '部分驳回' : text == '8' ? '全部驳回' : text == '9' ? '商标注册完成' : "未知"}</span> */}
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@ -654,7 +654,7 @@ export default function TrademarkMall() {
|
|||||||
const res: any = await trademarkList({
|
const res: any = await trademarkList({
|
||||||
|
|
||||||
keywords: state && state.keywords ? state.keywords : '',
|
keywords: state && state.keywords ? state.keywords : '',
|
||||||
trademarkStatus:state && state.trademarkStatus ? state.trademarkStatus : '',
|
trademarkStatus: state && state.trademarkStatus ? state.trademarkStatus : '',
|
||||||
rows: 10,
|
rows: 10,
|
||||||
page: page
|
page: page
|
||||||
})
|
})
|
||||||
@ -778,7 +778,7 @@ export default function TrademarkMall() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
style={{ textAlign: 'center' }} // 设置表格内容居中显示
|
style={{ textAlign: 'center' }} // 设置表格内容居中显示
|
||||||
rowKey="trademarkId" // 指定数据项的唯一标识符
|
rowKey="correctionId" // 指定数据项的唯一标识符
|
||||||
locale={{ emptyText: '暂无数据' }}
|
locale={{ emptyText: '暂无数据' }}
|
||||||
></Table>
|
></Table>
|
||||||
</Modal>
|
</Modal>
|
||||||
@ -799,7 +799,9 @@ export default function TrademarkMall() {
|
|||||||
{CorrectionType} */}
|
{CorrectionType} */}
|
||||||
<div className='editModal-title'>
|
<div className='editModal-title'>
|
||||||
<div className='editModal-title-box'></div>
|
<div className='editModal-title-box'></div>
|
||||||
<div className='editModal-title-name'>平台需要您补充的内容说明</div>
|
<div className='editModal-title-name'>
|
||||||
|
{correctionReply == '1' ? '平台需要您补充的内容说明' : '通知'}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className='correctionTitleBox'>
|
<div className='correctionTitleBox'>
|
||||||
<div className='correctionTitle'>主题</div>
|
<div className='correctionTitle'>主题</div>
|
||||||
@ -865,10 +867,16 @@ export default function TrademarkMall() {
|
|||||||
<div style={{
|
<div style={{
|
||||||
display: correctionReply == '0' && disabled ? 'none' : 'unset'
|
display: correctionReply == '0' && disabled ? 'none' : 'unset'
|
||||||
}}>
|
}}>
|
||||||
|
<div style={{
|
||||||
|
display: correctionReply == '0' ? 'none' : 'unset'
|
||||||
|
}}>
|
||||||
|
|
||||||
|
|
||||||
<div className='editModal-title' style={{ marginTop: 30, }}>
|
<div className='editModal-title' style={{ marginTop: 30, }}>
|
||||||
<div className='editModal-title-box'></div>
|
<div className='editModal-title-box'></div>
|
||||||
<div className='editModal-title-name'>在下面填写您补充的内容</div>
|
<div className='editModal-title-name'>在下面填写您补充的内容</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<Form
|
<Form
|
||||||
name="basic"
|
name="basic"
|
||||||
form={form}
|
form={form}
|
||||||
@ -891,6 +899,9 @@ export default function TrademarkMall() {
|
|||||||
}}
|
}}
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
>
|
>
|
||||||
|
<div style={{
|
||||||
|
display: correctionReply == '0' ? 'none' : 'unset'
|
||||||
|
}}>
|
||||||
<div className='correctionRemarkBox' >
|
<div className='correctionRemarkBox' >
|
||||||
<div className='correctionTitle'>内容</div>
|
<div className='correctionTitle'>内容</div>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
@ -917,11 +928,15 @@ export default function TrademarkMall() {
|
|||||||
|
|
||||||
}}
|
}}
|
||||||
placeholder='请输入需要补充内容'
|
placeholder='请输入需要补充内容'
|
||||||
disabled={correctionReply == '0'||disabled}
|
disabled={correctionReply == '0' || disabled}
|
||||||
></TextArea>
|
></TextArea>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style={{
|
||||||
|
display: correctionReply == '0' ? 'none' : 'unset'
|
||||||
|
}}>
|
||||||
<div className='correctionRemarkBox' style={{
|
<div className='correctionRemarkBox' style={{
|
||||||
marginTop: 0
|
marginTop: 0
|
||||||
}}>
|
}}>
|
||||||
@ -958,7 +973,7 @@ export default function TrademarkMall() {
|
|||||||
|
|
||||||
}}
|
}}
|
||||||
headers={{ 'Auth': `Bearer ${token}` }}
|
headers={{ 'Auth': `Bearer ${token}` }}
|
||||||
disabled={correctionReply == '0'|| disabled}
|
disabled={correctionReply == '0' || disabled}
|
||||||
>
|
>
|
||||||
<Button icon={<UploadOutlined />}>上传附件</Button>
|
<Button icon={<UploadOutlined />}>上传附件</Button>
|
||||||
</Upload>
|
</Upload>
|
||||||
@ -968,6 +983,7 @@ export default function TrademarkMall() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user