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

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

parents 7db42675 8f676135
......@@ -268,7 +268,7 @@ const bidRequestInfo: ISchema = {
openTenderTime: {
type: 'string',
"x-component": 'date',
title: '开标日期',
title: '开标时间',
required: true,
"x-component-props": {
disabledDate: current => {
......@@ -287,7 +287,7 @@ const bidRequestInfo: ISchema = {
disabledDate: current => {
return current && current < moment().startOf('second')
},
showTime: true,
showTime: false,
style: { width: "100%" }
}
},
......
......@@ -16,13 +16,16 @@ import { findLastIndexFlowState } from '@/utils';
import winBid from '@/assets/imgs/winBid.png'
import { SendOutlined } from '@ant-design/icons';
import { PublicApi } from '@/services/api';
import { usePageStatus } from '@/hooks/usePageStatus'
const formActions = createFormActions();
const ReadySendBidNoticeDetail: React.FC = () => {
const { formContext, id } = useNoticeDetail({type: 'callForBid'})
const { data, externalProcurementOrderLogResponses, interiorProcurementOrderLogResponses } = formContext
const {
action, // 1操作 null查看
} = usePageStatus()
const [visible, setVisible] = useState<boolean>(false)
const [loading, setLoading] = useState<boolean>(false)
......@@ -89,10 +92,11 @@ const ReadySendBidNoticeDetail: React.FC = () => {
<BidDetailHeader
formContext={formContext}
anchorList={anchorTitleList}
extraRight={
<Button type='primary' onClick={() => setVisible(true)} icon={<SendOutlined rotate={-45} />}>
发送中标公示
</Button>
extraRight={ action && [
<Button type='primary' onClick={() => setVisible(true)} icon={<SendOutlined rotate={-45} />}>
发送中标公示
</Button>
]
}
/>
<OrderDetailWrapper>
......
......@@ -11,7 +11,7 @@ export const useSelfTable = () => {
const ref = useRef<any>({})
const handleSubmit = async (record) => {
history.push(`/memberCenter/procurementAbility/callForBids/readySendBidNotice/detail?id=${record.id}`)
history.push(`/memberCenter/procurementAbility/callForBids/readySendBidNotice/detail?id=${record.id}&action=1`)
}
const baseBidListColumns: any[] = [
......
......@@ -32,17 +32,18 @@ export const columns = [
title: '含税/税率',
dataIndex: 'isTax',
key: 'isTax',
render: (t, r) => <><div>{t ? '是' : '否'}</div><div>{r.taxRate}</div></>
render: (t, r) => <><div>{t ? '是' : '否'}</div><div>{r.taxRate}%</div></>
},
{
title: '单价(含税)',
dataIndex: 'price',
key: 'price'
key: 'price',
render: t => `¥${t}`
},
{
title: '金额(含税)',
dataIndex: 'money',
key: 'money',
render: (t, r) => Number((r.price * r.count).toFixed(2))
render: (t, r) => `¥${Number((r.price * r.count).toFixed(2))}`
},
];
......@@ -442,7 +442,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
/** 类型数据映射 */
const Type_Data_Map = {
// 招标大类显示招标信息 投标大类显示投标信息
'basicInfo': apiType[0] === 'c' ? basicColumnList : basicTenderColumnList,
'basicInfo': (apiType[0] === 'c' || apiType === 'tenderInCallForBid') ? basicColumnList : basicTenderColumnList,
'bidNeed': callForNeedList,
'registerNeed': registerNeedList,
'checkNeed': checkNeedList,
......
......@@ -74,9 +74,9 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => {
},
{
title: '操作人',
dataIndex: 'memberRoleName',
dataIndex: 'userName',
align: 'center',
key: 'memberRoleName',
key: 'userName',
},
{
title: '部门',
......
......@@ -20,7 +20,7 @@ const TenderSearchDetail: React.FC = () => {
{ title: '中标明细', id: 'bidParticulars', componentName: "BidParticulars" },
{ title: '基本信息', id: 'baseicInfo', type: "basicInfo" },
{ title: '投标要求', id: 'tenderNeed', type: "bidNeed" },
{ title: '投标其他要求', id: 'tenderOtherNeed', type: "bidNeed" },
{ title: '投标其他要求', id: 'tenderOtherNeed', type: "otherNeed" },
{ title: '投标商品', id: 'tenderParticulars', componentName: "BidParticulars" },
{ title: '流转记录', id: 'transferRecord', componentName: "BidTransformRecord" },
]
......
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