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

7
src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
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>
</>

13
src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
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>