Skip to content

J
jinfa-platform
Commit 5ac9540b authored by Bill's avatar Bill
Browse files
Options

Merge branch 'dev-srm' of 10.0.0.22:lingxi/lingxi-business-paltform into dev-srm

parents 1bd533f0 7c6e5e90
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 33 deletions
src/pages/transaction/purchaseAbility/components/detail/components/bidTable/index.less
View file @ 5ac9540b
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
.bidConfirmWrapper { .bidConfirmWrapper {
overflow-x: scroll; overflow-x: scroll;
border-left: 4px solid #F4F5F7;
border-right: 4px solid #F4F5F7;
background: #F4F5F7;
.bidRowWrapper { .bidRowWrapper {
min-width: 1300px; min-width: 1300px;
} }
...@@ -29,7 +32,6 @@ ...@@ -29,7 +32,6 @@
} }
} }
} }
background: #F4F5F7;
.bidTableHead { .bidTableHead {
height: 40px; height: 40px;
line-height: 32px; line-height: 32px;
......
src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout1/index.tsx
View file @ 5ac9540b
...@@ -10,6 +10,7 @@ import { PublicApi } from '@/services/api'; ...@@ -10,6 +10,7 @@ import { PublicApi } from '@/services/api';
import ModalOperate from '../../../modalOperate'; import ModalOperate from '../../../modalOperate';
import BidTable from '../bidTable'; import BidTable from '../bidTable';
import style from './rowLayout/index.less'; import style from './rowLayout/index.less';
import { isEmpty } from 'lodash';
const chNum: { [key: number]: string } = { const chNum: { [key: number]: string } = {
1: '一', 1: '一',
...@@ -315,49 +316,89 @@ const ContrastLyout1: React.FC<IProps> = (props: any) => { ...@@ -315,49 +316,89 @@ const ContrastLyout1: React.FC<IProps> = (props: any) => {
{soure[idx] {soure[idx]
&& ( && (
<> <>
<div className={style.divider}> <div className={style.divider} style={{ marginTop: '12px' }}>
<div> <div>
<Divider type='vertical' className={style.vertical} /> <Divider type='vertical' className={style.vertical} />
比价信息 比价信息
</div> </div>
</div> </div>
<BidTable preview={bool ? bool : preview} redux={reduxFetch} /> <BidTable preview={bool ? bool : preview} redux={reduxFetch} />
{/* 授标了才显示 */}
{(preview && context.externalState === 99 && Number(item) === Number(turn)) &&
<Row gutter={[0, 4]} style={{ marginTop: '1em' }}>
{context.awardComments &&
<Col span={24}>
<div className={style['card-list']}>
<Row>
<Col span={3}><p className={style['card-list_title']}>授标意见:</p></Col>
<Col><p>{context.awardComments}</p></Col>
</Row>
</div>
</Col>
}
{!isEmpty(context.urls) &&
<Col span={24}>
<div className={style['card-list']}>
<Row>
<Col span={3}><p className={style['card-list_title']}>附件:</p></Col>
<Col>
{context.urls && context.urls.map((item, index) => (
<p key={`urls_${index + 1}`} className={style['card-list_file']}>
<Typography.Link
target="_blank"
key={`link_${index + 1}`}
href={`/api/contract/contractTemplate/downloadContract?contractName=${item.name}&contractUrl=${item.url}`}
>
<FilePdfOutlined style={{ marginRight: '5px' }} />
{item.name}
</Typography.Link>
</p>
))}
</Col>
</Row>
</div>
</Col>
}
</Row>
}
</> </>
)} )}
</Tabs.TabPane> </Tabs.TabPane>
))} ))}
</Tabs> </Tabs>
{preview && {(isPath === "offerInquire" && context.externalState === 99) && (
<Row gutter={[0, 4]} style={{ marginTop: '1em' }}> <div>
{context.awardComments && <div className={style.divider} style={{ marginTop: '12px' }}>
<Col span={24}> <div>
<div className={style['card-list']}> <Divider type='vertical' className={style.vertical} />
<Row> 确认授标结果
<Col span={2}><p className={style['card-list_title']}>授标意见:</p></Col> </div>
<Col><p>{context.awardComments}</p></Col> </div>
</Row> <Row gutter={[0, 4]} style={{ marginTop: '1em' }}>
</div> {context.awardResults && (
</Col> <Col span={24}>
} <div className={style['card-list']}>
{context.urls && <Row>
<Col span={24}> <Col span={3}><p className={style['card-list_title']}>中标公告:</p></Col>
<div className={style['card-list']}> <Col span={10}><p style={{ whiteSpace: 'break-spaces' }}>{context.awardResults}</p></Col>
<Row> </Row>
<Col span={2}><p className={style['card-list_title']}>附件:</p></Col> </div>
<Col> </Col>
{context.urls && context.urls.map((item, index) => ( )}
<p key={`urls_${index + 1}`} className={style['card-list_file']}> {context.content && (
<FilePdfOutlined className={style[`card-list_fileicon`]} /> <Col span={24}>
<Typography.Link href={item.url} target="_blank">{item.name}</Typography.Link> <div className={style['card-list']}>
</p> <Row>
))} <Col span={3}><p className={style['card-list_title']}>感谢函:</p></Col>
</Col> <Col span={10}><p style={{ whiteSpace: 'break-spaces' }}>{context.content}</p></Col>
</Row> </Row>
</div> </div>
</Col> </Col>
} )}
</Row> </Row>
} </div>
)}
<ModalOperate <ModalOperate
id={id} id={id}
title={type === 'next' ? '调整下轮报价时间' : '输入密匙'} title={type === 'next' ? '调整下轮报价时间' : '输入密匙'}
......
src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout1/rowLayout/index.less
View file @ 5ac9540b
...@@ -48,3 +48,7 @@ ...@@ -48,3 +48,7 @@
font-size: 12px; font-size: 12px;
} }
} }
.card-list_title {
font-size: 12px;
color: #909399;
}
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