6.16 询价修改新的外网平台地址

2022-06-16 15:46:10 +08:00
parent 7dc348be97
commit b4552dd28a
6 changed files with 129 additions and 77 deletions
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx
@ -1,6 +1,6 @@
 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';
@ -439,22 +439,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 +1021,14 @@ 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%26inqueryNo=${data?.ebpProjectNumber}%26offNo=${record?.offerOrderNo}`
+            getOfferUrl({ userId: JwtToken, page }).then(response => {
+              if (response?.code == 200) {
+                window.open(response?.data);
+              }
+            })
          }
        })
      }
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts
@ -99,7 +99,7 @@ export async function getEval(params: any) { // 获取页面接口数据
 }

 export async function getFile(id: any) { // 查找是否有应答文件
-  return request('/api/biz-service-ebtp-rsms/v1/review/config/detail/doc/list?detailId='+id, {
+  return request('/api/biz-service-ebtp-rsms/v1/review/config/detail/doc/list?detailId=' + id, {
    method: 'get',
  });
 }
@ -136,8 +136,8 @@ export async function saveOffer(data: any) { // 自动报价保存
 * 查询已报名的供应商
 * @param params 
 */
- export async function getPage(params?: any) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`,{
+export async function getPage(params?: any) {
+  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`, {
    method: 'GET',
  });
 }
@ -146,6 +146,17 @@ export async function saveOffer(data: any) { // 自动报价保存
 * 根据id查询项目信息
 * @param id 
 */
- export function getProjectById(id: any) {
-    return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
-  }
+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,
+  });
+}
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx
@ -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';
@ -466,22 +466,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 +1052,14 @@ 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%26inqueryNo=${data?.ebpProjectNumber}%26offNo=${record?.offerOrderNo}`
+            getOfferUrl({ userId: JwtToken, page }).then(response => {
+              if (response?.code == 200) {
+                window.open(response?.data);
+              }
+            })
          }
        })
      }
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/service.ts
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/service.ts
@ -215,8 +215,8 @@ export async function saveOffer(data: any) { // 自动报价保存
 * 查询已报名的供应商
 * @param params 
 */
- export async function getPage(params?: any) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`,{
+export async function getPage(params?: any) {
+  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`, {
    method: 'GET',
  });
 }
@ -225,6 +225,17 @@ export async function saveOffer(data: any) { // 自动报价保存
 * 根据id查询项目信息
 * @param id 
 */
- export function getProjectById(id: any) {
-    return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
-  }
+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,
+  });
+}
--- a/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx
+++ b/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx
@ -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 { getSessionUserData } from '@/utils/session';

 const Sing: React.FC<{}> = () => {
  //表格控制
@ -12,17 +13,24 @@ const Sing: React.FC<{}> = () => {
  const reviewTurnId = getURLInformation('turnId') == undefined ? '' : getURLInformation('turnId');
  //loading
  const [loading, setLoading] = useState<boolean>(false)
-
+  //当前登录人账号
+  const userId = getSessionUserData()?.userId;
  const toViewOffer = async (record: any) => {
-    if(record.decryptStatus == "1") {
+    if (record.decryptStatus == "1") {
      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%26inqueryNo=${data?.ebpProjectNumber}%26offNo=${record?.offerOrderNo}`
+          getOfferUrl({ userId, page }).then(response => {
+            if (response?.code == 200) {
+              window.open(response?.data);
+            }
+          })
        }
      }).finally(() => {
        setLoading(false)
@ -68,25 +76,25 @@ const Sing: React.FC<{}> = () => {
  return (
    <Card bordered={false} bodyStyle={{ padding: '24px 64px 24px 0px' }}>
      <Spin spinning={loading} delay={300}>
-      <ProTable
-        columns={columns}
-        actionRef={actionRef}
-        search={false}
-        options={false}
-        size="small"
-        pagination={false}
-        request={async () =>
-          await getPage(reviewTurnId).then((res) => {
-            // 表单搜索项会从 params 传入，传递给后端接口。
-            return {
-              data: res?.data,
-              success: res?.success,
-            };
-          })
-        }
-        rowKey="id"
-        dateFormatter="string"
-      />
+        <ProTable
+          columns={columns}
+          actionRef={actionRef}
+          search={false}
+          options={false}
+          size="small"
+          pagination={false}
+          request={async () =>
+            await getPage(reviewTurnId).then((res) => {
+              // 表单搜索项会从 params 传入，传递给后端接口。
+              return {
+                data: res?.data,
+                success: res?.success,
+              };
+            })
+          }
+          rowKey="id"
+          dateFormatter="string"
+        />
      </Spin>
    </Card>
  );
--- a/src/pages/ZXunJia/EvaluationRoom/Sing/service.ts
+++ b/src/pages/ZXunJia/EvaluationRoom/Sing/service.ts
@ -4,7 +4,7 @@ import request from '@/utils/request';
 * @param params 
 */
 export async function getPage(params?: any) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`,{
+  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`, {
    method: 'GET',
  });
 }
@ -13,6 +13,16 @@ export async function getPage(params?: any) {
 * 根据id查询项目信息
 * @param id 
 */
- export function getProjectById(id: any) {
-    return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
-  }
+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,
+  });
+}