Commit c18fd1c4 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

🐞 fix(): 修复采购询价bug

parent 660b333d
......@@ -89,15 +89,16 @@ const BidInfoLayout: React.FC<BidInfoProps> = (props: any) => {
render: (text: any, record: any) => (
<>
<Typography.Text>{text ? '是' : '否'}</Typography.Text>
&nbsp;
<Typography.Text type="secondary">{`(${record.taxProbability})`}</Typography.Text>
/
<Typography.Text>{`(${record.taxProbability}%)`}</Typography.Text>
</>
)
},
{
title: '单价(含税)',
key: 'taxUnitPrice',
dataIndex: 'taxUnitPrice'
dataIndex: 'taxUnitPrice',
render: (text: any, record: any) => <Typography.Text>{text.toFixed(2)}</Typography.Text>
},
{
title: (
......@@ -107,7 +108,8 @@ const BidInfoLayout: React.FC<BidInfoProps> = (props: any) => {
</Space>
),
key: 'taxPrice',
dataIndex: 'taxPrice'
dataIndex: 'taxPrice',
render: (text: any, record: any) => <Typography.Text>{text.toFixed(2)}</Typography.Text>
}
]
......
......@@ -51,12 +51,20 @@ const BidResultLayout: React.FC<BidResultProps> = (props: any) => {
{
title: '含税/税率',
key: 'isTax',
dataIndex: 'isTax'
dataIndex: 'isTax',
render: (text: any, record: any) => (
<>
<Typography.Text>{text ? '是' : '否'}</Typography.Text>
/
<Typography.Text>{`(${record.taxProbability}%)`}</Typography.Text>
</>
)
},
{
title: '单价(含税)',
key: 'taxUnitPrice',
dataIndex: 'taxUnitPrice'
dataIndex: 'taxUnitPrice',
render: (text: any, record: any) => <Typography.Text>{text.toFixed(2)}</Typography.Text>
},
{
title: (
......@@ -66,7 +74,8 @@ const BidResultLayout: React.FC<BidResultProps> = (props: any) => {
</Space>
),
key: 'taxPrice',
dataIndex: 'taxPrice'
dataIndex: 'taxPrice',
render: (text: any, record: any) => <Typography.Text>{text.toFixed(2)}</Typography.Text>
}
]
......
......@@ -47,10 +47,10 @@ const DetailDrawer: React.FC<IProps> = (props: any) => {
<Divider type="vertical" className={style.dividerStyle} />
{item.linkTitle}
</div>
{ item.linkContent.map((items, keys) => (
{item.linkContent.map((items, keys) => (
<div key={`content${keys + 1}`} className={style.list}>
<h5 className={style.listLable} style={{ flex: '0 0 100px' }}>{items.label}</h5>
{ !items.file && <h5 className={style.listContent}>{items.content}</h5>}
{!items.file && <h5 className={style.listContent}>{items.content}</h5>}
{
items.file
&& (
......@@ -58,9 +58,13 @@ const DetailDrawer: React.FC<IProps> = (props: any) => {
{items.content.length > 0 && items.content.map((v, index) => (
<div key={index} className={style.upload_item}>
<div className={style.upload_left}>
<Typography.Link href={v.url} target="_blank">
<LinkOutlined />
{v.name}
<Typography.Link
target="_blank"
key={`link_${index + 1}`}
href={`/api/contract/contractTemplate/downloadContract?contractName=${item.name}&contractUrl=${item.url}`}
>
<LinkOutlined style={{ marginRight: '5px' }} />
{item.name}
</Typography.Link>
</div>
</div>
......
......@@ -171,10 +171,7 @@ const BasicInfo: React.FC<IProps> = (props: any) => {
<Form.Item
label='内部状态'
name='interiorState'
>
{fetchdata && <Badge status={OFFTER_INTERNALSTATE_COLOR[fetchdata.interiorState]} text={fetchdata.interiorStateName} />}
</Form.Item>
/>
</Form>
)
}
......
......@@ -107,7 +107,15 @@ const File: React.FC<IProps> = (props) => {
{fileForEach().length > 0 && fileForEach().map((v, index) => (
<div key={index} className={styles.upload_item}>
<div className={styles.upload_left}>
<Typography.Link href={v.url} target="_blank"><LinkOutlined style={{ marginRight: '5px' }} />{v.name}</Typography.Link>
<Typography.Link
style={{ display: 'block', paddingBottom: '8px' }}
key={`link_${index + 1}`}
href={`/api/contract/contractTemplate/downloadContract?contractName=${v.name}&contractUrl=${v.url}`}
target="_blank"
>
<LinkOutlined style={{ marginRight: '5px' }} />
{v.name}
</Typography.Link>
</div>
{checkRound === round && (
<div className={styles.upload_right} onClick={() => removeFiles(index)}>
......
......@@ -377,7 +377,15 @@ const CrossSellProducts: React.FC<IProps> = (props: any) => {
{files.length > 0 && files.map((v, index) => (
<div key={index} className={style.upload_item}>
<div className={style.upload_left}>
<Typography.Link href={v.url} target="_blank"><LinkOutlined style={{ marginRight: '5px' }} />{v.name}</Typography.Link>
<Typography.Link
style={{ display: 'block', paddingBottom: '8px' }}
key={`link_${index + 1}`}
href={`/api/contract/contractTemplate/downloadContract?contractName=${v.name}&contractUrl=${v.url}`}
target="_blank"
>
<LinkOutlined style={{ marginRight: '5px' }} />
{v.name}
</Typography.Link>
</div>
{!preview && (
<div className={style.upload_right} onClick={() => removeFiles(index)}>
......
......@@ -85,7 +85,15 @@ const File: React.FC<IProps> = (props) => {
{files.length > 0 && files.map((v, index) => (
<div key={index} className={styles.upload_item}>
<div className={styles.upload_left}>
<Typography.Link href={v.url} target="_blank"><LinkOutlined style={{ marginRight: '5px' }} />{v.name}</Typography.Link>
<Typography.Link
style={{ display: 'block', paddingBottom: '8px' }}
key={`link_${index + 1}`}
href={`/api/contract/contractTemplate/downloadContract?contractName=${v.name}&contractUrl=${v.url}`}
target="_blank"
>
<LinkOutlined style={{ marginRight: '5px' }} />
{v.name}
</Typography.Link>
</div>
<div className={styles.upload_right} onClick={() => removeFiles(index)}>
<DeleteOutlined />
......
......@@ -425,7 +425,15 @@ const DrawerWrite: React.FC<Iprops> = (props: any) => {
{files.length > 0 && files.map((v, index) => (
<div key={index} className={style.upload_item}>
<div className={style.upload_left}>
<Typography.Link href={v.url} target="_blank"><LinkOutlined style={{ marginRight: '5px' }} />{v.name}</Typography.Link>
<Typography.Link
style={{ display: 'block', paddingBottom: '8px' }}
key={`link_${index + 1}`}
href={`/api/contract/contractTemplate/downloadContract?contractName=${v.name}&contractUrl=${v.url}`}
target="_blank"
>
<LinkOutlined style={{ marginRight: '5px' }} />
{v.name}
</Typography.Link>
</div>
{!preview && <div className={style.upload_right}>
<DeleteOutlined />
......
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