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

@ -21,6 +21,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"
/*
* 招标公告开始
@ -60,6 +61,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
const { TabPane } = Tabs;
const { confirm } = Modal;
const columns: ProColumns<DataItem>[] = [
@ -592,8 +595,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);
}
})
}
@ -720,6 +724,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
) : null}
</TabPane>
</Tabs>
<ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
</div>
)
}

View File

@ -19,6 +19,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"
/*
* 招标公示开始
@ -51,6 +52,8 @@ const BidPublicityResult: 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 columns: ProColumns<DataItem>[] = [
@ -351,8 +354,9 @@ const BidPublicityResult: 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);
}
})
}
@ -400,6 +404,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
setRefresh(Math.random() + 1)
}} data={approvalData} annoId={recordData?.id} />
) : null}
<ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
</Spin>
</div>
)