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

@ -1,3 +1,4 @@
import ApprovalModal from '@/components/ApprovalModal';
import BidEvalAppointment from '@/components/ElecBidEvaluation/BidEvalAppointment';
import { btnAuthority } from '@/utils/authority';
import { checkObjectId } from '@/utils/DownloadUtils';
@ -47,6 +48,8 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
const [loading, setLoading] = useState<boolean>(false);
//电子评标室-评标室预约选择 2022.9.8 zhoujianlong
const [selectEvalVisible, setSelectEvalVisible] = useState<boolean>(false);
const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
const toAdd = async () => {
await checkedAddAfresh(values.id).then((res) => {
@ -124,8 +127,9 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (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);
}
}).finally(() => {
setLoading(false);
@ -365,6 +369,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
/>
{/**电子评标室-评标室预约选择 */}
<BidEvalAppointment modalVisible={selectEvalVisible} onCancel={() => { setSelectEvalVisible(false), setRecordData(undefined) }} onSubmit={() => { }} values={recordData} type={"2"} reload={() => { actionRef.current?.reload?.(); }} />
<ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
</Drawer>
);
};

View File

@ -1,3 +1,4 @@
import ApprovalModal from '@/components/ApprovalModal';
import { btnAuthority } from '@/utils/authority';
import { isEmpty } from '@/utils/CommonUtils';
import { checkObjectId } from '@/utils/DownloadUtils';
@ -63,6 +64,8 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
const [approvalVisible, setApprovalVisible] = useState<boolean>(false);
//选择流程数据存储
const [approvalData, setApprovalData] = useState<any[]>([]);
const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
//初始化显示字段
let sectionName = '采购包';
sectionName =
@ -242,8 +245,9 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (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);
}
}).finally(() => {
setLoading(false)
@ -650,6 +654,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
actionRef.current?.reload?.();
}} data={approvalData} annoId={recordData?.sendMessageId} />
) : null}
<ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
</Drawer>
);
};