4.1 同步发版内容到天梯

src/pages/Calibration/ProjectManager/ResultNotice/components/FwftzsModal.tsx

@@ -3,7 +3,6 @@ import { Form, Input, Modal, message, Spin } from 'antd';
 import ProCard from '@ant-design/pro-card';
 import Weboffice from "@/pages/webOffice/weboffice";
 import { getDefId, getProMethod } from "@/utils/session";
-import { getFileListByBid, getThisFileBidList } from '../service';
 import ExtendUpload from '@/utils/ExtendUpload';
 import WebOffice0609, { WebOfficeRefProps } from '@/pages/webOffice/weboffice0609';
 
@@ -166,6 +165,7 @@ const FwftzsModal: React.FC<FwftzsModalProps> = (props) => {
               PDFFileCode={PDFfileCode}
               savePDF={true}
               webOfficeRef={ref}
+              fileName={`${values?.sectionName}-${values?.bidSectBizNum}-服务费通知书-${values?.supplierCompanyName}`}
             />
           ) : null}
         </ProCard>

src/pages/Calibration/ProjectManager/ResultNotice/components/JgtzsModal.tsx

@@ -5,7 +5,6 @@ import Weboffice from "@/pages/webOffice/weboffice";
 
 import ExtendUpload from "@/utils/ExtendUpload";
 import { getDefId, getProMethod } from "@/utils/session";
-import { getFileListByBid, getThisFileBidList } from "@/pages/Calibration/ProjectManager/ResultNotice/service";
 import WebOffice0609, { WebOfficeRefProps } from '@/pages/webOffice/weboffice0609';
 
 interface JgtzsModalProps {
@@ -176,6 +175,7 @@ const JgtzsModal: React.FC<JgtzsModalProps> = (props) => {
               PDFFileCode={PDFfileCode}
               savePDF={true}
               webOfficeRef={ref}
+              fileName={`${values?.sectionName}-${values?.bidSectBizNum}-${values?.noticeType == "1" ? name1 : '结果'}通知书-${values?.supplierCompanyName}`}
             />
           ) : null}
         </ProCard>

src/pages/Calibration/ProjectManager/ResultNotice/components/ReasultTable.tsx

@@ -18,6 +18,7 @@ import JgtzsModal from './JgtzsModal';
 import FwftzsModal from './FwftzsModal';
 import JgtzsSendModal from './JgtzsSendModal';
 import FwftzsSendModal from './FwftzsSendModal';
+import { getSectionDataById } from '@/services/common';
 
 
 interface IndexProps {
@@ -188,8 +189,10 @@ const Index: React.FC<IndexProps> = (props) => {
   ]
 
   const clickJgtzs = (jgtzsId: any, formDisabled: any) => {
-    getJgtzsValues(jgtzsId).then((res) => {
+    getJgtzsValues(jgtzsId).then(async (res) => {
       if (res.success === true) {
+        const sectionData = await getSectionDataById(res.data.sectionId);
+        res.data.bidSectBizNum = sectionData?.code == 200 ? sectionData.data.bidSectBizNum : null;
         setJgtzsValues(res.data);
         setjgtzsFormDisabled(formDisabled);
         setJgtzsFormVisible(true);
@@ -198,8 +201,10 @@ const Index: React.FC<IndexProps> = (props) => {
   }
 
   const clickFwftzs = (jgtzsId: any, formDisabled: any) => {
-    getFwftzsValues(jgtzsId).then((res) => {
+    getFwftzsValues(jgtzsId).then(async (res) => {
       if (res.success === true) {
+        const sectionData = await getSectionDataById(res.data.sectionId);
+        res.data.bidSectBizNum = sectionData?.code == 200 ? sectionData.data.bidSectBizNum : null;
         setFwftzsValues(res.data);
         setFwftzsFormDisabled(formDisabled);
         setFwftzsFormVisible(true);

src/pages/Calibration/ProjectManager/ResultNotice/service.ts

@@ -136,28 +136,3 @@ export async function sendFinisCalibration(params: any) {
     }
   })
 }
-export async function getThisFileBidList(Bid: string) {
-  if(Bid==null||Bid==""||Bid==undefined){
-    return [];
-  }
-  return request('/api/core-service-ebtp-updownload/v1/attachment/find',{
-    method: 'post',
-    data: {
-      "bidList": [Bid]
-    }
-  }).then(res => {
-    return res;
-  })
-}
-
-/**
- * 根据bid获取文件列表
- * @param params
- */
- export async function getFileListByBid(params: any) {
-  
-  return request('/api/core-service-ebtp-updownload/v1/attachment/find', {
-    method: 'POST',
-    data: {...params}
-  });
-}

src/pages/Calibration/Supplier/ViewNotice/components/PreviewJgtzsModal.tsx

@@ -3,8 +3,7 @@ import { Modal, Button } from 'antd';
 import PDF from 'react-pdf-js';
 import ProCard from '@ant-design/pro-card';
 import FileDown from '@/utils/Download';
-
-import { checkFileExist } from "../service"
+import { getDownloadFileUrl, getFileListByBid } from '@/utils/DownloadUtils';
 
 interface PreviewJgtzsModalProps {
   fileId: string,
@@ -20,7 +19,7 @@ const PreviewJgtzsModal: React.FC<PreviewJgtzsModalProps> = (props) => {
   const [fileExist, setFileExist] = useState<string>("0");//0：未验证，1：验证后有，2：验证后没有
 
   useEffect(() => {
-    checkFileExist(fileId).then(res => {
+    getFileListByBid(fileId).then(res => {
       if (res !== undefined && res.length > 0) {
         setFileExist("1");
       } else {
@@ -40,10 +39,7 @@ const PreviewJgtzsModal: React.FC<PreviewJgtzsModalProps> = (props) => {
   const handleNext = () => {
     setPage(page + 1);
   }
-  const downLoadFile = (fileId: string) => {
-    const returnUrl = "/api/core-service-ebtp-updownload/v1/attachment/download/bid/" + fileId;
-    return returnUrl;
-  }
+
   const modalHeight = window.innerHeight * 96 / 100;
 
   return (
@@ -66,7 +62,7 @@ const PreviewJgtzsModal: React.FC<PreviewJgtzsModalProps> = (props) => {
               <FileDown
                 key="downLoadFile"
                 type="pdf"
-                apiUrl={downLoadFile(fileId)}
+                objectId={fileId}
                 style={{ "float": "left" }}
                 fileName={downLoadFileName}
                 btnName="下载"
@@ -88,7 +84,7 @@ const PreviewJgtzsModal: React.FC<PreviewJgtzsModalProps> = (props) => {
         ) : fileExist == "1" ? (
           <>
             <PDF
-              file={downLoadFile(fileId)}
+              file={getDownloadFileUrl(fileId)}
               scale={1.6}
               onDocumentComplete={onDocumentComplete}
               page={page}

src/pages/Calibration/Supplier/ViewNotice/service.ts

@@ -20,13 +20,6 @@ export async function getSubPayServiceFeeList(params:any) {
     }
   })
 }
-
-//检验文档中心是否存在该文档
-export async function checkFileExist(fileId?:any) {
-  return request('/api/core-service-ebtp-updownload/v1/attachment/find/bid/'+fileId,{
-    method:'GET' ,
-  })
-}
 /**
  * 缴纳中标服务费
  * @param id