Merge branch '20220519-多轮招募割接测试' 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:42:19 +08:00
10 changed files with 67 additions and 58 deletions

View File

@ -19,6 +19,7 @@ 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"
/*
* 招标公告开始
@ -165,7 +166,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -175,7 +176,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -185,7 +186,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -195,7 +196,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -207,7 +208,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线</Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -285,7 +286,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -295,7 +296,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button type="text" hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -305,7 +306,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -315,7 +316,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -325,7 +326,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>

View File

@ -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) => {
<Button type="text" onClick={() => toRead(record)}>
</Button>
<Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
</Button>
</>
@ -175,7 +176,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
<Button type="text" onClick={() => toRead(record)}>
</Button>
<Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
</Button>
</>
@ -197,7 +198,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
>
</Button>
<Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
</Button>
<Popconfirm
@ -220,7 +221,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
<Button type="text" onClick={() => toRead(record)}>
</Button>
<Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
</Button>
</>
@ -238,7 +239,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
<Button type="text" onClick={() => toRead(record)}>
</Button>
<Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
</Button>
</>

View File

@ -19,6 +19,7 @@ import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
import { releaseNoticeOffline } from "@/pages/Bid/BiddingAnnouncement/service"
import { isEmpty } from "@/utils/CommonUtils"
import { checkObjectId } from "@/utils/DownloadUtils"
/*
* 招标公示开始
@ -164,7 +165,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -174,7 +175,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>&nbsp;&nbsp;
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -184,7 +185,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}></Button>&nbsp;&nbsp;
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>&nbsp;&nbsp;
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -194,7 +195,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -221,7 +222,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>&nbsp;&nbsp;
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线</Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>

View File

@ -24,6 +24,7 @@ import moment from "moment";
import "@/assets/xsy_style.less";
import { btnAuthority } from "@/utils/authority";
import { numberToChinese } from '@/utils/CommonUtils';
import { checkObjectId } from '@/utils/DownloadUtils';
interface BiddingDocumentsDecryptProps {
@ -397,8 +398,8 @@ const BiddingDocumentsDecrypt: React.FC<BiddingDocumentsDecryptProps> = (props)
<Button disabled={disabled} type="text"
onClick={() => download(record?.filePath, headType ? record?.companyName + "第" + item.turnSort + "轮" + responseType + "文件" : record?.companyName + responseType + "文件", record, item?.id)}
icon={<DownloadOutlined />}></Button>
<Button disabled={disabled} type="text" onClick={() => OpenWindow(record, item?.id)}
icon={<DownloadOutlined />}></Button>
{checkObjectId(record.id) && <Button disabled={disabled} type="text" onClick={() => OpenWindow(record, item?.id)}
icon={<DownloadOutlined />}></Button>}
</>
);
}

View File

@ -1,4 +1,5 @@
import { btnAuthority } from '@/utils/authority';
import { checkObjectId } from '@/utils/DownloadUtils';
import { getProMethod } from '@/utils/session';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { Button, Drawer, message, Popconfirm } from 'antd';
@ -197,7 +198,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
<a key="1" onClick={() => toView(record)}>
</a>
<a key="2" onClick={() => toCheckApproval(record)}>
<a key="2" onClick={() => toCheckApproval(record)} hidden={!checkObjectId(record.id)}>
</a>
</>
@ -215,7 +216,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
<a key="1" onClick={() => toView(record)}>
</a>
<a key="2" onClick={() => toCheckApproval(record)}>
<a key="2" onClick={() => toCheckApproval(record)} hidden={!checkObjectId(record.id)}>
</a>
</>
@ -226,7 +227,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
<a key="1" onClick={() => toView(record)}>
</a>
<a key="2" onClick={() => toCheckApproval(record)}>
<a key="2" onClick={() => toCheckApproval(record)} hidden={!checkObjectId(record.id)}>
</a>
</>

View File

@ -1,5 +1,6 @@
import { btnAuthority } from '@/utils/authority';
import { isEmpty } from '@/utils/CommonUtils';
import { checkObjectId } from '@/utils/DownloadUtils';
import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
import { getDicData, getProId } from '@/utils/session';
@ -371,7 +372,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
<Button type="text" key="6" onClick={() => toViewNotice(record)}>
</Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}></Button>
@ -394,7 +395,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
<Button type="text" key="6" onClick={() => toViewNotice(record)}>
</Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Popconfirm
@ -427,7 +428,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
<Button type="text" key="5" onClick={() => toEditNotice(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
</Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Popconfirm
@ -460,7 +461,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
<Button type="text" key="6" onClick={() => toViewNotice(record)}>
</Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
@ -476,7 +477,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
<Button type="text" key="6" onClick={() => toViewNotice(record)}>
</Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Popconfirm
@ -509,7 +510,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
<Button type="text" key="6" onClick={() => toViewNotice(record)}>
</Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}></Button>

View File

@ -20,6 +20,7 @@ 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"
/*
* 资审公告开始
@ -134,7 +135,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -144,7 +145,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -154,7 +155,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -164,7 +165,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -176,7 +177,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线</Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -254,7 +255,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -264,7 +265,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -274,7 +275,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -284,7 +285,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>
@ -294,7 +295,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}></Button>

View File

@ -20,6 +20,7 @@ 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"
/*
* 招标公告开始
@ -126,7 +127,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -136,7 +137,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -146,7 +147,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -156,7 +157,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -170,7 +171,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线</Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -269,7 +270,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -279,7 +280,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -289,7 +290,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}></Button>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -299,7 +300,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -311,7 +312,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>

View File

@ -18,6 +18,7 @@ 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"
/*
* 招标公示开始
@ -118,7 +119,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
let btn2 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -128,7 +129,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>&nbsp;&nbsp;
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -138,7 +139,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}></Button>&nbsp;&nbsp;
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}></Button>&nbsp;&nbsp;
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -148,7 +149,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
let btn5 = (
<>
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>
@ -158,7 +159,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
<>
<Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}></Button>&nbsp;&nbsp;
<Button type="text" onClick={() => toRead(record)}></Button>
<Button type="text" key="9" onClick={() => toApprovalFor(record)}>
<Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
</Button>
<Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}></Button>

View File

@ -2,7 +2,7 @@
* @Author: zhoujianlong
* @Date: 2022-03-03 09:06:36
* @Last Modified by: zhoujianlong
* @Last Modified time: 2022-03-17 16:40:43
* @Last Modified time: 2022-05-18 17:23:26
*/
import { getDownloadSecretKey, getFilelist, getFilelistBySecond } from "@/services/download_";
@ -60,7 +60,7 @@ export interface FilelistProps {
* @param objectId
* @returns
*/
const checkObjectId = (objectId: string) => {
export const checkObjectId = (objectId: string) => {
const pattern = /[a-zA-Z]+/;
return objectId.length == 19 && !pattern.test(objectId);
}