1.12 提交

This commit is contained in:
jl-zhoujl2
2023-01-12 18:44:25 +08:00
parent 7fb6242e0c
commit f2a1835aff
9 changed files with 106 additions and 34 deletions

View File

@ -20,6 +20,7 @@ import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
import { isEmpty } from "@/utils/CommonUtils"
import { checkObjectId } from "@/utils/DownloadUtils"
import ApprovalModal from "@/components/ApprovalModal"
/*
* 招标公告开始
@ -58,6 +59,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
const [recordData, setRecordData] = useState<any>({});//存储当前record数据
const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
let name1 = "中标";
let name2 = "评标";
@ -598,8 +601,9 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
if (res?.code == 200 || res?.success == true) {
const data = res?.data;
let durl = /http:\/\/([^\/]+)\//i;
let d = data?.traceDetailUrl?.replace(durl, '/');
window.open(d);
let d = data?.replace(durl, '/');
setApprovalViewUrl(d);
setApprovalViewVisible(true);
}
})
}
@ -691,6 +695,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
}
}} data={approvalData} annoId={recordData?.id} />
) : null}
<ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
</Spin>
</div>
)

View File

@ -21,6 +21,7 @@ import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
import { checkObjectId } from '@/utils/DownloadUtils';
import ReasonMemo from './ReasonMemo';
import ApprovalModal from '@/components/ApprovalModal';
/*
* 招标公告开始
@ -50,6 +51,8 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
const [recordData, setRecordData] = useState<any>({});//存储当前record数据
const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
const [memoVisible, setMemoVisible] = useState<boolean>(false);//说明弹窗
let proName = ''; //名称
@ -132,10 +135,10 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
>
</Button>
<Button
hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
<Button
hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) || record.reasonMemo == null || record.reasonMemo == undefined}
type="text"
onClick={() => toEditReasonMemo(record,"edit")}
onClick={() => toEditReasonMemo(record, "edit")}
>
</Button>
@ -168,9 +171,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
</Button>
<Button
hidden={ record.reasonMemo== null ||record.reasonMemo==undefined}
hidden={record.reasonMemo == null || record.reasonMemo == undefined}
type="text"
onClick={() => toEditReasonMemo(record,"read")}
onClick={() => toEditReasonMemo(record, "read")}
>
</Button>
@ -193,9 +196,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
</Button>
<Button
hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
hidden={record.reasonMemo == null || record.reasonMemo == undefined}
type="text"
onClick={() => toEditReasonMemo(record,"read")}
onClick={() => toEditReasonMemo(record, "read")}
>
</Button>
@ -214,9 +217,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
</Button>
<Button
hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) || record.reasonMemo == null || record.reasonMemo == undefined}
type="text"
onClick={() => toEditReasonMemo(record,"edit")}
onClick={() => toEditReasonMemo(record, "edit")}
>
</Button>
@ -252,9 +255,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
</Button>
<Button
hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
hidden={record.reasonMemo == null || record.reasonMemo == undefined}
type="text"
onClick={() => toEditReasonMemo(record,"read")}
onClick={() => toEditReasonMemo(record, "read")}
>
</Button>
@ -277,9 +280,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
</Button>
<Button
hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
hidden={record.reasonMemo == null || record.reasonMemo == undefined}
type="text"
onClick={() => toEditReasonMemo(record,"read")}
onClick={() => toEditReasonMemo(record, "read")}
>
</Button>
@ -473,20 +476,21 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
if (res?.code == 200 || res?.success == true) {
const data = res?.data;
let durl = /http:\/\/([^\/]+)\//i;
let d = data?.traceDetailUrl?.replace(durl, '/');
window.open(d);
let d = data?.replace(durl, '/');
setApprovalViewUrl(d);
setApprovalViewVisible(true);
}
});
};
/*编辑原因说明*/
const toEditReasonMemo = (props: any,type: any) => {
const toEditReasonMemo = (props: any, type: any) => {
setPkId(props.id);
setType(type);
setMemoVisible(true);
};
const Proref = useRef<ActionType>();
return (
<div style={{ height: '100%', position: 'relative' }}>
<Spin spinning={spin}>
@ -564,15 +568,16 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
}} data={approvalData} annoId={recordData?.id} />
) : null}
{memoVisible ? (
<ReasonMemo
modalVisible={memoVisible}
<ReasonMemo
modalVisible={memoVisible}
id={pkId}
type={type}
onCancel={() => {
setMemoVisible(false)
}}
/>
) : null}
) : null}
<ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
</div>
);
};