diff --git a/config/config.UAT.ts b/config/config.UAT.ts index 22b07c1..c31047c 100644 --- a/config/config.UAT.ts +++ b/config/config.UAT.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV:'UAT', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8280/provider_uat', + // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8280/provider_uat', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/config/config.dev.ts b/config/config.dev.ts index 971d818..2a4cf79 100644 --- a/config/config.dev.ts +++ b/config/config.dev.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV: 'DEV', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider_dev', + // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider_dev', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/config/config.prod.ts b/config/config.prod.ts index 99e7610..c00bb2e 100644 --- a/config/config.prod.ts +++ b/config/config.prod.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV:'PROD', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'https://60.10.26.178/provider', + // REACT_APP_XUNJIA_REDIRECT: 'https://60.10.26.178/provider', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/config/config.sim.ts b/config/config.sim.ts index bce3024..fa9e473 100644 --- a/config/config.sim.ts +++ b/config/config.sim.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV: 'sim', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider', + // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx b/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx index d351579..41c620e 100644 --- a/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx +++ b/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx @@ -3,7 +3,7 @@ import { Button, Table, Tabs, Space, Progress, Radio, Input, Checkbox, Select, M import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getEval, getFile, calculationPriceScore, saveOffer, getPage, getProjectById, getOfferUrl } from './service'; import '@/assets/ld_style.less' import FirstTrialTableDetailed from '../BidDetailedManager/module/FirstTrialTableDetailed'; -import { getSessionUserData, getRoomId, getUserToken, getProMethod, getProId, getSectionQuot } from '@/utils/session'; +import { getSessionUserData, getRoomId, getUserToken, getProMethod, getProId, getSectionQuot, getSessionRoleData } from '@/utils/session'; import FileDown from '@/utils/Download'; import { getURLInformation } from '@/utils/CommonUtils'; import { btnAuthority } from '@/utils/authority'; @@ -68,6 +68,8 @@ const Index: React.FC<{}> = () => { const modalHeight = (innerHeight * 96) / 100; //获取标段的标价类型 1-百分比 0-元 const sectionQuot = getSectionQuot(); + //当前登录人角色 + const roleCode = getSessionRoleData()?.roleCode; let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商 if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标 showNameT = { tbr: '投标人', pb: '评标', tb: '投标' }; @@ -1021,14 +1023,15 @@ const Index: React.FC<{}> = () => { } await getProjectById(getProId()).then(response => { if (response?.code == 200 && response?.success == true) { - const resData = response?.data - window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`) - // const page = `quote-ztbIndex%26inqueryNo=${data?.ebpProjectNumber}%26offNo=${record?.offerOrderNo}` - // getOfferUrl({ userId: JwtToken, page }).then(response => { - // if (response?.code == 200) { - // window.open(response?.data); - // } - // }) + const data = response?.data + // window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`) + const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`; + const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID; + getOfferUrl({ userId, page }).then(response => { + if (response?.code == 200) { + window.open(response?.data); + } + }) } }) } diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx index d54a7f2..09666af 100644 --- a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx +++ b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx @@ -8,7 +8,7 @@ import ConsistencyCheck from './components/ConsistencyCheck'; import BidDetailSummary from './components/BidDetailSummary'; import BidDetailSpeed from './components/BidDetailSpeed'; import { handleSubmit } from './utils'; -import { getProId, getProMethod, getRoomId, getSectionQuot, getSessionUserData, getUserToken } from '@/utils/session'; +import { getProId, getProMethod, getRoomId, getSectionQuot, getSessionRoleData, getSessionUserData, getUserToken } from '@/utils/session'; import FileDown from '@/utils/Download'; import { getURLInformation, isEmpty } from '@/utils/CommonUtils'; import { btnAuthority } from '@/utils/authority'; @@ -90,6 +90,8 @@ const Index: React.FC<{}> = () => { const sectionQuot = getSectionQuot(); const [isEndProgress, setIsEndProgress] = useState(false); // 是否可编辑 const [submitLoading, setSubmitLoading] = useState(false); // 提交汇总loading + //当前登录人角色 + const roleCode = getSessionRoleData()?.roleCode; let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商 if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标 showNameT = { tbr: '投标人', pb: '评标', tb: '投标' }; @@ -1052,14 +1054,15 @@ const Index: React.FC<{}> = () => { } await getProjectById(getProId()).then(response => { if (response?.code == 200 && response?.success == true) { - const resData = response?.data - window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`) - // const page = `quote-ztbIndex%26inqueryNo=${data?.ebpProjectNumber}%26offNo=${record?.offerOrderNo}` - // getOfferUrl({ userId: JwtToken, page }).then(response => { - // if (response?.code == 200) { - // window.open(response?.data); - // } - // }) + const data = response?.data + // window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`) + const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`; + const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID; + getOfferUrl({ userId, page }).then(response => { + if (response?.code == 200) { + window.open(response?.data); + } + }) } }) } diff --git a/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx b/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx index 246ac2e..5c27e42 100644 --- a/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx +++ b/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx @@ -4,7 +4,7 @@ import { Button, Card, message, Spin } from 'antd'; import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import { getOfferUrl, getPage, getProjectById } from './service'; import { getURLInformation } from '@/utils/CommonUtils'; -import { getSessionUserData } from '@/utils/session'; +import { getSessionRoleData } from '@/utils/session'; const Sing: React.FC<{}> = () => { //表格控制 @@ -13,24 +13,25 @@ const Sing: React.FC<{}> = () => { const reviewTurnId = getURLInformation('turnId') == undefined ? '' : getURLInformation('turnId'); //loading const [loading, setLoading] = useState(false) - //当前登录人账号 - const userId = getSessionUserData()?.userId; + //当前登录人角色 + const roleCode = getSessionRoleData()?.roleCode; const toViewOffer = async (record: any) => { if (record.decryptStatus == "1") { - message.info("应答文件未解密，无法查看报价详情，请先到【应答文件查看】中进行解密") + message.info("应答文件未解密，无法查看报价详情，请先到【应答文件查看】中进行解密"); } else { setLoading(true) await getProjectById(record?.projectId).then((res) => { if (res?.code == 200 && res?.success == true) { const data = res?.data; - const url = `${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${data?.ebpProjectNumber}&offer_no=${record?.offerOrderNo}` - window.open(url); - // const page = `quote-ztbIndex%26inqueryNo=${data?.ebpProjectNumber}%26offNo=${record?.offerOrderNo}` - // getOfferUrl({ userId, page }).then(response => { - // if (response?.code == 200) { - // window.open(response?.data); - // } - // }) + // const url = `${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${data?.ebpProjectNumber}&offer_no=${record?.offerOrderNo}` + // window.open(url); + const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`; + const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID; + getOfferUrl({ userId, page }).then(response => { + if (response?.code == 200) { + window.open(response?.data); + } + }) } }).finally(() => { setLoading(false) diff --git a/src/typings.d.ts b/src/typings.d.ts index 86fb366..33e3ba7 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -49,4 +49,6 @@ declare const REACT_APP_PASSWORD_PUBLICKEY: string /**ENV-环境参数 */ declare const START_ENV: string /**ENV-询价查看报价跳转地址 */ -declare const REACT_APP_XUNJIA_REDIRECT: string \ No newline at end of file +// declare const REACT_APP_XUNJIA_REDIRECT: string +/**ENV-询价查看报价跳转地址 */ +declare const REACT_APP_XUNJIA_UID: string