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

6.17 询价修改

Browse Source
This commit is contained in:
jl-zhoujl2
2022-06-17 12:12:09 +08:00
parent c7723de638
commit dfb22c2a06
8 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.UAT.ts
View File

@ -18,6 +18,8 @@ export default defineConfig({
START_ENV:'UAT', 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',
}, },
}); });

4
config/config.dev.ts
View File

@ -18,6 +18,8 @@ export default defineConfig({
START_ENV: 'DEV', 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',
}, },
}); });

4
config/config.prod.ts
View File

@ -18,6 +18,8 @@ export default defineConfig({
START_ENV:'PROD', 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',
}, },
}); });

4
config/config.sim.ts
View File

@ -18,6 +18,8 @@ export default defineConfig({
START_ENV: 'sim', 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',
}, },
}); });

21
src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx
View File

@ -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 { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getEval, getFile, calculationPriceScore, saveOffer, getPage, getProjectById, getOfferUrl } from './service';
import '@/assets/ld_style.less' import '@/assets/ld_style.less'
import FirstTrialTableDetailed from '../BidDetailedManager/module/FirstTrialTableDetailed'; 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 FileDown from '@/utils/Download';
import { getURLInformation } from '@/utils/CommonUtils'; import { getURLInformation } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority'; import { btnAuthority } from '@/utils/authority';
@ -68,6 +68,8 @@ const Index: React.FC<{}> = () => {
const modalHeight = (innerHeight * 96) / 100; const modalHeight = (innerHeight * 96) / 100;
//获取标段的标价类型 1-百分比 0-元 //获取标段的标价类型 1-百分比 0-元
const sectionQuot = getSectionQuot(); const sectionQuot = getSectionQuot();
//当前登录人角色
const roleCode = getSessionRoleData()?.roleCode;
let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商 let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商
if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标 if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标
showNameT = { tbr: '投标人', pb: '评标', tb: '投标' }; showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
@ -1021,14 +1023,15 @@ const Index: React.FC<{}> = () => {
} }
await getProjectById(getProId()).then(response => { await getProjectById(getProId()).then(response => {
if (response?.code == 200 && response?.success == true) { if (response?.code == 200 && response?.success == true) {
const resData = response?.data const data = response?.data
window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`) // 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}` const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`;
// getOfferUrl({ userId: JwtToken, page }).then(response => { const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID;
// if (response?.code == 200) { getOfferUrl({ userId, page }).then(response => {
// window.open(response?.data); if (response?.code == 200) {
// } window.open(response?.data);
// }) }
})
} }
}) })
} }

21
src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx
View File

@ -8,7 +8,7 @@ import ConsistencyCheck from './components/ConsistencyCheck';
import BidDetailSummary from './components/BidDetailSummary'; import BidDetailSummary from './components/BidDetailSummary';
import BidDetailSpeed from './components/BidDetailSpeed'; import BidDetailSpeed from './components/BidDetailSpeed';
import { handleSubmit } from './utils'; 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 FileDown from '@/utils/Download';
import { getURLInformation, isEmpty } from '@/utils/CommonUtils'; import { getURLInformation, isEmpty } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority'; import { btnAuthority } from '@/utils/authority';
@ -90,6 +90,8 @@ const Index: React.FC<{}> = () => {
const sectionQuot = getSectionQuot(); const sectionQuot = getSectionQuot();
const [isEndProgress, setIsEndProgress] = useState<boolean>(false); // 是否可编辑 const [isEndProgress, setIsEndProgress] = useState<boolean>(false); // 是否可编辑
const [submitLoading, setSubmitLoading] = useState<boolean>(false); // 提交汇总loading const [submitLoading, setSubmitLoading] = useState<boolean>(false); // 提交汇总loading
//当前登录人角色
const roleCode = getSessionRoleData()?.roleCode;
let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商 let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商
if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标 if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标
showNameT = { tbr: '投标人', pb: '评标', tb: '投标' }; showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
@ -1052,14 +1054,15 @@ const Index: React.FC<{}> = () => {
} }
await getProjectById(getProId()).then(response => { await getProjectById(getProId()).then(response => {
if (response?.code == 200 && response?.success == true) { if (response?.code == 200 && response?.success == true) {
const resData = response?.data const data = response?.data
window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`) // 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}` const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`;
// getOfferUrl({ userId: JwtToken, page }).then(response => { const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID;
// if (response?.code == 200) { getOfferUrl({ userId, page }).then(response => {
// window.open(response?.data); if (response?.code == 200) {
// } window.open(response?.data);
// }) }
})
} }
}) })
} }

25
src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx
View File

@ -4,7 +4,7 @@ import { Button, Card, message, Spin } from 'antd';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { getOfferUrl, getPage, getProjectById } from './service'; import { getOfferUrl, getPage, getProjectById } from './service';
import { getURLInformation } from '@/utils/CommonUtils'; import { getURLInformation } from '@/utils/CommonUtils';
import { getSessionUserData } from '@/utils/session'; import { getSessionRoleData } from '@/utils/session';
const Sing: React.FC<{}> = () => { const Sing: React.FC<{}> = () => {
//表格控制 //表格控制
@ -13,24 +13,25 @@ const Sing: React.FC<{}> = () => {
const reviewTurnId = getURLInformation('turnId') == undefined ? '' : getURLInformation('turnId'); const reviewTurnId = getURLInformation('turnId') == undefined ? '' : getURLInformation('turnId');
//loading //loading
const [loading, setLoading] = useState<boolean>(false) const [loading, setLoading] = useState<boolean>(false)
//当前登录人账号 //当前登录人角色
const userId = getSessionUserData()?.userId; const roleCode = getSessionRoleData()?.roleCode;
const toViewOffer = async (record: any) => { const toViewOffer = async (record: any) => {
if (record.decryptStatus == "1") { if (record.decryptStatus == "1") {
message.info("应答文件未解密，无法查看报价详情，请先到【应答文件查看】中进行解密") message.info("应答文件未解密，无法查看报价详情，请先到【应答文件查看】中进行解密");
} else { } else {
setLoading(true) setLoading(true)
await getProjectById(record?.projectId).then((res) => { await getProjectById(record?.projectId).then((res) => {
if (res?.code == 200 && res?.success == true) { if (res?.code == 200 && res?.success == true) {
const data = res?.data; const data = res?.data;
const url = `${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${data?.ebpProjectNumber}&offer_no=${record?.offerOrderNo}` // const url = `${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${data?.ebpProjectNumber}&offer_no=${record?.offerOrderNo}`
window.open(url); // window.open(url);
// const page = `quote-ztbIndex%26inqueryNo=${data?.ebpProjectNumber}%26offNo=${record?.offerOrderNo}` const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`;
// getOfferUrl({ userId, page }).then(response => { const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID;
// if (response?.code == 200) { getOfferUrl({ userId, page }).then(response => {
// window.open(response?.data); if (response?.code == 200) {
// } window.open(response?.data);
// }) }
})
} }
}).finally(() => { }).finally(() => {
setLoading(false) setLoading(false)

4
src/typings.d.ts vendored
View File

@ -49,4 +49,6 @@ declare const REACT_APP_PASSWORD_PUBLICKEY: string
/**ENV-环境参数 */ /**ENV-环境参数 */
declare const START_ENV: string declare const START_ENV: string
/**ENV-询价查看报价跳转地址 */ /**ENV-询价查看报价跳转地址 */
declare const REACT_APP_XUNJIA_REDIRECT: string // declare const REACT_APP_XUNJIA_REDIRECT: string
/**ENV-询价查看报价跳转地址 */
declare const REACT_APP_XUNJIA_UID: string