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

Merge branch '20220519-多轮招募割接测试' into 'master-20220527'

Browse Source 
5.27 1、多轮招募割接测试，查看审批流程报错 2、多轮招募割接测试，评审室下载投标文件报错

See merge request eshop/fe_service_ebtp_frontend!84
This commit is contained in:
周建龙
2022-05-27 15:04:36 +08:00
parent 9bf8133fcc 34525199e8
commit 3e310186e4
10 changed files with 205 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
View File

@ -19,6 +19,7 @@ import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service";
import { btnAuthority } from "@/utils/authority";
import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
import { checkObjectId } from "@/utils/DownloadUtils"
/*
* 招标公告开始
@ -124,7 +125,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>
</>
@ -133,7 +134,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>
</>
@ -142,7 +143,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 type="text" onClick={() => handleRemove(record)}>删除</Button>
@ -151,7 +152,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 type="text" onClick={() => toChange(record)}>变更</Button>
@ -164,7 +165,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>
</>
@ -261,7 +262,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>
</>
@ -270,7 +271,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>
</>
@ -279,7 +280,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={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
@ -288,7 +289,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>
{getProMethod() == "procurement_mode_4" ?
@ -299,7 +300,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>
</>

11
src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
View File

@ -17,6 +17,7 @@ import { getProId } from "@/utils/session";
import { btnAuthority } from "@/utils/authority";
import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
import { checkObjectId } from "@/utils/DownloadUtils"
/*
* 招标公示开始
@ -116,7 +117,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>
</>
@ -125,7 +126,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>
</>
@ -134,7 +135,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 type="text" onClick={() => handleRemove(record)}>删除</Button>
@ -143,7 +144,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>
</>
@ -152,7 +153,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>
</>