Commit 3c3707b7 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:

parent 670536ed
......@@ -93,7 +93,7 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
// initRender.status = data.status ? '待发送' : '已发送'
initRender.status = '待发送'
initRender.expertExtractQueryList = initConditionData
initRender.inviteTender = { id: code}
initRender.inviteTender = { id: code }
setInitFormValue(initRender)
}
})
......@@ -193,16 +193,17 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
const addd = (<span>添加评标内容</span>)
const selectButton = pageStatus !== PageStatus.PREVIEW
const selectButton = (pageStatus !== PageStatus.PREVIEW)
?
<div style={{display: 'flex', alignItems: 'center'}}>
<div className="connectBtn" onClick={handleClick}><LinkOutlined style={{marginRight: 4}}/>选择</div>
<a style={{paddingLeft: 10, display: 'block', height: '32px', lineHeight: '32px', backgroundColor: '#fff'}} onClick={clickPreviewDetail}>查看详情</a>
</div>
:
<div style={{display: 'flex', alignItems: 'center'}}>
<a style={{paddingLeft: 10, display: 'block', height: '32px', lineHeight: '32px', backgroundColor: '#fff'}} onClick={clickPreviewDetail}>查看详情</a>
</div>
: null
const JumpDetails = () => (<a
target="_blank"
onClick={clickPreviewDetail}
>{initFormValue?.code || initFormValue?.inviteTender?.code}</a>)
const selectExpertButton = pageStatus !== PageStatus.PREVIEW && <Space size={16} style={{marginBottom: 16}}>
<Button onClick={conditionExtractExpret} icon={<ThunderboltFilled />}>按条件抽取专家</Button>
......@@ -317,7 +318,8 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
schema={formSchema}
onSubmit={handleSubmit}
components={{
ArrayTable
ArrayTable,
JumpDetails
}}
effects={($, ctx) => {
$('onFormMount').subscribe(() => {
......
......@@ -68,6 +68,7 @@ export const formSchema: ISchema = {
type: 'string',
title: '招标编号',
readOnly: true,
'x-component': 'JumpDetails'
},
openTenderTime: {
type: 'string',
......
......@@ -16,7 +16,6 @@ export const useSelfTable = () => {
align: 'left',
dataIndex: 'id',
key: 'id',
// width: 60,
render: (text, record, index) => index + 1
},
{
......@@ -28,7 +27,7 @@ export const useSelfTable = () => {
<EyePreview url={`/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.id}`}>
{text}
</EyePreview>
<div>{record['projectName']}</div>
<div style={{width: 240, whiteSpace: "nowrap", overflow: 'hidden', textOverflow: "ellipsis"}} title={record['projectName']}>{record['projectName']}</div>
</>
},
{
......@@ -51,7 +50,6 @@ export const useSelfTable = () => {
dataIndex: 'createTime',
key: 'createTime',
render: (text, record) => formatTimeString(record.createTime),
// width: 180
},
{
title: '报名开始/截止时间',
......@@ -62,7 +60,6 @@ export const useSelfTable = () => {
<div><PlayCircleOutlined />&nbsp;{formatTimeString(record.registerStartTime)}</div>
<div><PoweroffOutlined />&nbsp;{formatTimeString(record.registerEndTime)}</div>
</>,
// width: 180
},
{
title: '资格预审开始/截止时间',
......@@ -73,7 +70,6 @@ export const useSelfTable = () => {
{record.preCheckStartTime ? <div><PlayCircleOutlined />&nbsp;{formatTimeString(record.preCheckStartTime)}</div> : null}
{record.preCheckEndTime ? <div><PoweroffOutlined />&nbsp;{formatTimeString(record.preCheckEndTime)}</div> : null}
</>,
// width: 180
},
{
title: '投标开始/截止时间',
......
......@@ -97,7 +97,7 @@ const ExtractNoticeManageDetail: React.FC = () => {
</Col>
<Col span={18}>
<p className={styles.cardListText}>
<Button type="link" onClick={clickPreviewDetail}>{inviterInfo?.code}</Button>
<a onClick={clickPreviewDetail}>{inviterInfo?.code}</a>
</p>
</Col>
</Row>
......
......@@ -26,7 +26,7 @@ export const useSelfTable = () => {
<EyePreview url={`/memberCenter/procurementAbility/tender/callForBidsSearch/detail?id=${record.id}`}>
{text}
</EyePreview>
<div>{record['projectName']}</div>
<div style={{width: 240, whiteSpace: "nowrap", overflow: 'hidden', textOverflow: "ellipsis"}} title={record['projectName']}>{record['projectName']}</div>
</>
},
// {
......
......@@ -19,6 +19,7 @@ import { UPLOAD_TYPE } from '@/constants'
import styles from './index.less'
import { validatorByte } from '@/utils/regExp'
import UploadImage from '@/components/UploadImage'
import { getAuth } from '@/utils/auth'
const { Step } = Steps;
......@@ -68,6 +69,7 @@ const AddBrand: React.FC<{}> = () => {
const [banSomeField, setBanSomeField] = useState<boolean>(false)
const [isDisabledSave, setIsDisabledSave] = useState<boolean>(false)
const [isDisabledCheck, setDisabledCheck] = useState<boolean>(true)
const { roles, memberRoleId } = getAuth() || {};
useEffect(()=>{
const { id } = history.location.query
......@@ -198,7 +200,7 @@ const AddBrand: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="流程进度">
<Steps progressDot current={currentStep}>
<Step title="提交审核" description="供应商" />
<Step title="提交审核" description={roles.filter(item => item.memberRoleId === memberRoleId)[0]['memberRoleName']} />
<Step title="审核品牌" description="平台" />
<Step title="完成" description="" />
</Steps>
......
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