Skip to content

J
jinfa-platform
Commit 02008ab8 authored by xiexiuxing's avatar xiexiuxing
Browse files
Options

merge:合并合同功能调整

parent 1c5b1f4c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
src/pages/contract/manage/details/index.tsx
View file @ 02008ab8
......@@ -433,22 +433,16 @@ const Details = (props: any) => {
<div className='ant-card-head'>
<div className='ant-card-head-wrapper'>
<div className='ant-card-head-wrapper'>
<<<<<<< HEAD
{intl.formatMessage({ id: 'contract.dianzihetong' })}
=======
{contractText.isUseElectronicContract ? intl.formatMessage({ id: 'contract.dianzihetong' }) : intl.formatMessage({ id: 'contract.zhizhihetong' })}
>>>>>>> c401c53d5 (feat:合同功能调整)
</div>
</div>
</div>
<div className='ant-card-body'>
<div className={style.upload_item} style={{ width: 680 }}>
<div className='ant-card-head-wrapper'>
<<<<<<< HEAD
{intl.formatMessage({ id: 'contract.dianzihetong' })}
=======
{contractText.isUseElectronicContract ? intl.formatMessage({ id: 'contract.dianzihetong' }) : intl.formatMessage({ id: 'contract.zhizhihetong' })}
>>>>>>> c401c53d5 (feat:合同功能调整)
</div>
<div className={style.upload_left} onClick={() => onDownload(contractText)} style={{ width: 600, cursor: 'pointer' }}>
<FileWordFilled />
......
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