diff --git a/src/components/Promenu/index.tsx b/src/components/Promenu/index.tsx
index e4cc2d2..df22467 100644
--- a/src/components/Promenu/index.tsx
+++ b/src/components/Promenu/index.tsx
@@ -66,10 +66,7 @@ const Promenu: React.FC<{}> = () => {
const open = Boolean(anchorEl);
useEffect(() => {
- //TODO zyx假数据-start
- menuList({ defId: 'bid_qualification', projectId: '1920644626460389376' }).then(res => {
- // menuList({ defId: defId, projectId: projectId }).then(res => {
- //TODO zyx假数据-end
+ menuList({ defId: defId, projectId: projectId }).then(res => {
if (res.code === 200) {
let data = res.data;
setData(data);
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index 6b4f94b..4f049cc 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -596,6 +596,38 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
setPageloading(false);
})
};
+ //招标公告结构化
+ const addAnnoStruc = async (annoId: any, editStatus: boolean) => {
+ spinSet(true);
+ let pass = false;
+ await checkConflict(tpId).then(resp => {
+ if (resp?.code == 200) {
+ if (!resp?.data) {
+ pass = true;
+ } else {
+ message.error("对不起,当前存在相关的采购实施计划,不能创建新的公告!");
+ }
+ }
+ });
+ /*校验是否有标包可以使用*/
+ pass && await GetNoticeUsablePackage(tpId).then(res => {
+ if (res.code == 200) {
+ if (res.data.length == 0) {
+ message.warn("没有可关联的" + name4)
+ } else {
+ history.push({
+ pathname: '/biddingAnnouncement/BiddingAnnoStructureForm',
+ state: {
+ projectId: tpId,
+ annoId: annoId ? annoId : undefined,
+ editStatus: editStatus
+ }
+ });
+ }
+ }
+ })
+ spinSet(false);
+ }
//公告审批单&变更公告审批单
const toApprovalFor = async (record: any) => {
await getApprovalFor(record.id).then(res => {
@@ -618,6 +650,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
loading={pageloading}
toolBarRender={() => [
(defId === 'bid_qualification') &&
+ ,
,
,