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

Merge branch '20220616-询价修改新的外网平台地址' into 'release_20220617'

Browse Source 
6.17 询价修改新的外网平台地址

See merge request eshop/fe_service_ebtp_frontend!119
This commit is contained in:
周建龙
2022-06-17 21:15:07 +08:00
parent 2cace55608 dfb22c2a06
commit 0a49a50967
11 changed files with 154 additions and 85 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',
//询价查看报价跳转地址
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',
//询价查看报价跳转地址
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',
//询价查看报价跳转地址
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',
//询价查看报价跳转地址
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',
},
});

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

@ -1,9 +1,9 @@
import React, { useEffect, useState } from 'react';
import { Button, Table, Tabs, Space, Progress, Radio, Input, Checkbox, Select, Modal, Pagination, Spin, Form, message, Upload } from 'antd';
import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getEval, getFile, calculationPriceScore, saveOffer, getPage, getProjectById } 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 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: '投标' };
@ -439,22 +441,22 @@ const Index: React.FC<{}> = () => {
bidEvalDetailDTOList = []
})
} else {
let date = {
          bidEvalId: bidEvalId,
          reviewTurnId: reviewTurnId,
          category: typeCategory,
          assessRoomId: assessRoomId,
          reviewType: '2'
        }
        getProgress({ ...date }).then((res) => {
          if (res.code == 200) {
            if(res.data == 100){
              submitApi()
            } else {
              message.error("您有未完成的打分项，请完成后再提交！")
            }
          }
        })
let date = {
bidEvalId: bidEvalId,
reviewTurnId: reviewTurnId,
category: typeCategory,
assessRoomId: assessRoomId,
reviewType: '2'
}
getProgress({ ...date }).then((res) => {
if (res.code == 200) {
if (res.data == 100) {
submitApi()
} else {
message.error("您有未完成的打分项，请完成后再提交！")
}
}
})
}
}
}
@ -1021,8 +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 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);
}
})
}
})
}

11
src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts
View File

@ -149,3 +149,14 @@ export async function saveOffer(data: any) { // 自动报价保存
export function getProjectById(id: any) {
return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
}
/**
* 加密后的查看报价详情跳转地址
* @param params
*/
export function getOfferUrl(params: any) {
return request('/api/biz-service-ebtp-extend/v1/singlePoint/getSsoUrlByPage', {
method: 'GET',
params: params,
});
}

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

@ -1,6 +1,6 @@
import React, { useEffect, useRef, useState } from 'react';
import { Button, Table, Tabs, Space, Progress, Radio, Input, Checkbox, Select, Modal, Menu, Pagination, Spin, Form, message, Collapse, Upload } from 'antd';
import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getMemberInfo, getEval, getUnlock, getCheckData, isStatus, getFile, calculationPriceScore, saveOffer, getPage, getProjectById } from './service';
import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getMemberInfo, getEval, getUnlock, getCheckData, isStatus, getFile, calculationPriceScore, saveOffer, getPage, getProjectById, getOfferUrl } from './service';
import '@/assets/ld_style.less'
import FirstTrialTableDetailed from '../BidDetailedManager/module/FirstTrialTableDetailed';
import { getExperts } from '../BidDetailedManager/service';
@ -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<boolean>(false); // 是否可编辑
const [submitLoading, setSubmitLoading] = useState<boolean>(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: '投标' };
@ -466,22 +468,22 @@ const Index: React.FC<{}> = () => {
bidEvalDetailDTOList = []
})
} else {
let date = {
          bidEvalId: bidEvalId,
          reviewTurnId: reviewTurnId,
          category: typeCategory,
          assessRoomId: assessRoomId,
          reviewType: '2'
        }
        getProgress({ ...date }).then((res) => {
          if (res.code == 200) {
            if(res.data == 100){
              submitApi()
            } else {
              message.error("您有未完成的打分项，请完成后再提交！")
            }
          }
        })
let date = {
bidEvalId: bidEvalId,
reviewTurnId: reviewTurnId,
category: typeCategory,
assessRoomId: assessRoomId,
reviewType: '2'
}
getProgress({ ...date }).then((res) => {
if (res.code == 200) {
if (res.data == 100) {
submitApi()
} else {
message.error("您有未完成的打分项，请完成后再提交！")
}
}
})
}
}
}
@ -1052,8 +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 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);
}
})
}
})
}

11
src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/service.ts
View File

@ -228,3 +228,14 @@ export async function saveOffer(data: any) { // 自动报价保存
export function getProjectById(id: any) {
return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
}
/**
* 加密后的查看报价详情跳转地址
* @param params
*/
export function getOfferUrl(params: any) {
return request('/api/biz-service-ebtp-extend/v1/singlePoint/getSsoUrlByPage', {
method: 'GET',
params: params,
});
}

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

@ -2,8 +2,9 @@ import React, { useRef, useState } from 'react';
import '@/assets/xsy_style.less';
import { Button, Card, message, Spin } from 'antd';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { getPage, getProjectById } from './service';
import { getOfferUrl, getPage, getProjectById } from './service';
import { getURLInformation } from '@/utils/CommonUtils';
import { getSessionRoleData } from '@/utils/session';
const Sing: React.FC<{}> = () => {
//表格控制
@ -12,17 +13,25 @@ const Sing: React.FC<{}> = () => {
const reviewTurnId = getURLInformation('turnId') == undefined ? '' : getURLInformation('turnId');
//loading
const [loading, setLoading] = useState<boolean>(false)
//当前登录人角色
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 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)

10
src/pages/ZXunJia/EvaluationRoom/Sing/service.ts
View File

@ -16,3 +16,13 @@ export async function getPage(params?: any) {
export function getProjectById(id: any) {
return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
}
/**
* 加密后的查看报价详情跳转地址
* @param params
*/
export function getOfferUrl(params: any) {
return request('/api/biz-service-ebtp-extend/v1/singlePoint/getSsoUrlByPage', {
method: 'GET',
params: params,
});
}

4
src/typings.d.ts vendored
View File

@ -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
// declare const REACT_APP_XUNJIA_REDIRECT: string
/**ENV-询价查看报价跳转地址 */
declare const REACT_APP_XUNJIA_UID: string