Merge branch '20220520-常态化招募项目再次发布无法发布最新公告' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220413-zjl-公共服务平台

This commit is contained in:
jl-zhoujl2
2022-05-20 14:32:42 +08:00
10 changed files with 57 additions and 45 deletions

View File

@ -1,4 +1,4 @@
import { UnorderedListOutlined } from "@ant-design/icons"
import { ExclamationCircleOutlined, UnorderedListOutlined } from "@ant-design/icons"
import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
import { Button, Card, Divider, Drawer, message, Modal, Spin, Table, Tabs } from "antd"
import React, { useEffect, useRef, useState } from "react"
@ -60,6 +60,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
const { TabPane } = Tabs;
const { confirm } = Modal;
const columns: ProColumns<DataItem>[] = [
{
title: '公告名称',
@ -302,6 +303,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
{getProMethod() == "procurement_mode_4" ?
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleReleaseAgain(record)}></Button> : null}
</>
);
let btn6 = (
@ -508,17 +511,32 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
/**
* 再次发布
* */
const handleReleaseAgain = async (record: any) => {
setPageloading(true);
await releaseNoticeAgain(record.id).then(res => {
if (res.code == 200) {
message.success('发布成功');
if (type == "change" || type == "changeNew") {
GetList(FpkId);
const handleReleaseAgain = (record: any) => {
const releaseAgain = async () => {
setPageloading(true);
await releaseNoticeAgain(record.id).then(res => {
if (res.code == 200) {
message.success('发布成功');
if (type == "change" || type == "changeNew") {
GetList(FpkId);
}
}
}
setRefresh(Math.random() + 1)
}).finally(() => setPageloading(false));
setRefresh(Math.random() + 1)
}).finally(() => setPageloading(false));
}
if (record?.hasChangeAnno) {//存在处于已发布状态的变更公告
confirm({
title: '有已发布的变更公告,是否再次发布原公告?',
icon: <ExclamationCircleOutlined />,
centered: true,
okText: '发布',
onOk() {
releaseAgain();
},
});
} else {
releaseAgain();
}
};
/**