liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20220519-多轮招募割接测试' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220413-zjl-公共服务平台

Browse Source
This commit is contained in:
jl-zhoujl2
2022-05-20 14:42:19 +08:00
parent 598a75f936 34525199e8
commit 3aaa1bb36c
10 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
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>

11
src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
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>
</>