diff --git a/config/router.config.ts b/config/router.config.ts index 4cccf4d..1bc3f07 100644 --- a/config/router.config.ts +++ b/config/router.config.ts @@ -79,6 +79,10 @@ export default [ path: '/AuctionParticipateDetail', component: './Auction/AuctionParticipateDetail', }, + {//公共服务平台 + path: '/PublicPlatform', + component: './Bid/BiddingAnnouncement/components/PublicPlatform', + }, //==============================================================引入的业务路由 ...approvalForm,//审批单 diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx index fc23162..f54b13a 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx @@ -18,6 +18,8 @@ import { history } from "umi"; import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" +import { isEmpty } from "@/utils/CommonUtils" +import { checkObjectId } from "@/utils/DownloadUtils" /* * 招标公告开始 @@ -157,42 +159,47 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> + ); let btn2 = ( <> - + ); let btn3 = ( <> - + ); let btn4 = ( <> - + ); let btn5 = ( <> - + ); @@ -201,9 +208,10 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { - + ); @@ -271,51 +279,57 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> + ); let btn2 = ( <> - + ); let btn3 = ( <> - + ); let btn4 = ( <> - + ); let btn5 = ( <> - + ); let btn6 = ( <> - + ); diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx index 88793e0..f65c443 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx @@ -12,6 +12,7 @@ import { getProMethod } from "@/utils/session"; import WebOffice0609, { WebOfficeRefProps } from "@/pages/webOffice/weboffice0609"; import moment from "moment"; import { AnnouncementGetMsg1, AnnouncementGetMsg2, AnnouncementGetMsg3, AnnouncementGetMsg4 } from "@/utils/AboutAnnouncementHelp"; +import { trim } from "@/utils/CommonUtils"; interface BiddingDocumentProps { modalVisible: boolean; @@ -213,7 +214,7 @@ const BiddingDocument: React.FC = (props) => { let fromData = { "tpId": tpId, - "documentName": form.getFieldValue("documentName"), + "documentName": trim(form.getFieldValue("documentName")), "documentSetId": form.getFieldValue("documentSetId"), "sections": packageMsg, "contentFileId": ref.current?.DocFileCode, diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx index 59482e0..2d6153a 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx @@ -19,6 +19,7 @@ import { getProId, getProMethod, getSessionProjectData } from '@/utils/session'; import { btnAuthority } from '@/utils/authority'; import { getApprProcessList } from '@/utils/SeleApprovalProcess/service'; import SeleApprovalProcess from '@/utils/SeleApprovalProcess'; +import { checkObjectId } from '@/utils/DownloadUtils'; /* * 招标公告开始 @@ -157,7 +158,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { - @@ -175,7 +176,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { - @@ -197,7 +198,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { > 提交审批 - = (props) => { - @@ -238,7 +239,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { - diff --git a/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx b/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx index b110980..334ed4f 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx @@ -71,6 +71,7 @@ const Media: React.FC = (props) => { message: '当前项不可为空', }, ]} + extra="如选择发布到【中国招标投标公共服务平台】,在发布前需填写【公共服务平台】信息" > = () => { + //loading + const [loading, setLoading] = useState(false); + //右侧浮动层监听Dom + const [container, setContainer] = useState(null); + //初始数据 + const [initialData, setInitialData] = useState({}); + //只读状态readOnly 默认只读 + const [readOnly, setReadOnly] = useState(true); + //公示or公告 true-公示 false-公告 + const [annoType, setAnnoType] = useState(false); + //annoId 公告公示id + const annoId = getURLInformation("id"); + //资审流程所处阶段 (roomType 2是后审,1是预审) + const roomType = getURLInformation('roomType') === null ? '2' : getURLInformation('roomType'); + //采购方式 + const proMethod = getProMethod(); + //所有流程名 + const flowName = getAllFlowNameByRoomType(proMethod, roomType); + //流程id + const defId = getDefId(); + //获取字典 + const getDict: any = getDicData(); + const dictData = JSON.parse(getDict); + + const { TextArea } = Input; + const { Panel } = Collapse; + const { Text } = Typography; + const { Link } = Anchor; + const [form] = Form.useForm(); + //Input + function returnInput(name: string | string[], label: string, readonly: boolean, initialValue: string | number | null, rules?: any[], placeholder?: string, maxLength?: number, extra?: React.ReactNode, width?: string | number, type?: string, suffix?: React.ReactNode) { + return ( + + + + ) + } + //TextArea + function returnArea(name: string | string[], label: string, readonly: boolean, initialValue: string | null, rules?: any[], placeholder?: string, extra?: React.ReactNode, maxLength?: number) { + return ( + +