4.1 同步发版内容到天梯

src/pages/ZZhaoMu/Calibration/BidPublicityResult/components/BidPublicityResults.tsx

@@ -107,9 +107,9 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
     Int();
     form.resetFields();//清除form中数据
   }, [pkId, type]);
-  useEffect(() => {
-    UploadMethod();
-  }, [UploadID]);
+  // useEffect(() => {
+  //   UploadMethod();
+  // }, [UploadID]);
   const Int = () => {
     setSping(true);
     if (type == "cease") {

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

@@ -2,9 +2,7 @@ import React, { useEffect, useState, useRef } from 'react';
 import { Form, Input, Modal, message, Spin } from 'antd';
 import ProCard from '@ant-design/pro-card';
 import Weboffice from "@/pages/webOffice/weboffice";
-import { getThisFileBidList } from '@/pages/Calibration/ProjectManager/ResultNotice/service';
 import ExtendUpload from '@/utils/ExtendUpload';
-import { getFileListByBid } from '../service';
 import WebOffice0609, { WebOfficeRefProps } from '@/pages/webOffice/weboffice0609';
 
 interface FwftzsModalProps {
@@ -137,6 +135,7 @@ const FwftzsModal: React.FC<FwftzsModalProps> = (props) => {
               PDFFileCode={PDFfileCode}
               savePDF={true}
               webOfficeRef={ref}
+              fileName={`${values?.sectionName}-${values?.bidSectBizNum}-服务费通知书-${values?.supplierCompanyName}`}
             />
           ) : null}
         </ProCard>

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

@@ -4,8 +4,6 @@ import ProCard from '@ant-design/pro-card';
 import Weboffice from "@/pages/webOffice/weboffice";
 
 import ExtendUpload from "@/utils/ExtendUpload";
-import { getThisFileBidList } from "@/pages/Calibration/ProjectManager/ResultNotice/service";
-import { getFileListByBid } from '../service';
 import WebOffice0609, { WebOfficeRefProps } from '@/pages/webOffice/weboffice0609';
 
 interface JgtzsModalProps {
@@ -137,6 +135,7 @@ const JgtzsModal: React.FC<JgtzsModalProps> = (props) => {
               PDFFileCode={PDFfileCode}
               savePDF={true}
               webOfficeRef={ref}
+              fileName={`${values?.sectionName}-${values?.bidSectBizNum}-${values?.noticeType == "1" ? '中选' : '结果'}通知书-${values?.supplierCompanyName}`}
             />
           ) : null}
         </ProCard>

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

@@ -7,6 +7,7 @@ import ProTable, { ActionType } from '@ant-design/pro-table';
 import { Button, message } from 'antd';
 import React, { useState, useEffect, useRef } from 'react';
 import { getFwftzsSendList, getFwftzsValues, getJgtzsSendList, getJgtzsValues, getZMBidTurnMsg, saveFwftzsValues, saveJgtzsValues, sendFwftzs, sendJgtzs } from '../service';
+import { getSectionDataById } from '@/services/common';
 
 interface IndexProps {
   item?: any,
@@ -43,8 +44,10 @@ const Index: React.FC<IndexProps> = (props) => {
   const [t2, setT2] = useState<any>(true);
 
   const clickJgtzs = (jgtzsId: any, formDisabled: any) => {
-    getJgtzsValues(jgtzsId).then((res) => {
+    getJgtzsValues(jgtzsId).then(async (res) => {
       if (res.code == 200) {
+        const sectionData = await getSectionDataById(res.data.sectionId);
+        res.data.bidSectBizNum = sectionData?.code == 200 ? sectionData.data.bidSectBizNum : null;
         setJgtzsValues(res.data);
         setjgtzsFormDisabled(formDisabled);
         setJgtzsFormVisible(true);
@@ -54,8 +57,10 @@ const Index: React.FC<IndexProps> = (props) => {
   }
 
   const clickFwftzs = (jgtzsId: any, formDisabled: any) => {
-    getFwftzsValues(jgtzsId).then((res) => {
+    getFwftzsValues(jgtzsId).then(async (res) => {
       if (res.code == 200) {
+        const sectionData = await getSectionDataById(res.data.sectionId);
+        res.data.bidSectBizNum = sectionData?.code == 200 ? sectionData.data.bidSectBizNum : null;
         setFwftzsValues(res.data);
         setFwftzsFormDisabled(formDisabled);
         setFwftzsFormVisible(true);
@@ -250,7 +255,7 @@ const Index: React.FC<IndexProps> = (props) => {
               }
               return (
                 <>
-                  <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" 
+                  <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text"
                     onClick={() => clickJgtzs(record.id, jgFormDisabled)}>{jgBtnName}</Button>
                   <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) || fwfBtnHidden} type="text"
                     onClick={() => clickFwftzs(record.id, fwfFormDisabled)}>{fwfBtnName}</Button>

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

@@ -156,14 +156,3 @@ export async function getZMBidTurnList(params?:any){
 export async function getZMBidTurnMsg(params?:any){
   return request('/api/biz-service-ebtp-calibration/v1/bizbidresultnotice/getRecruitRNoticelist/'+params)
 }
-/**
- * 根据bid获取文件列表
- * @param params
- */
- export async function getFileListByBid(params: any) {
-  
-  return request('/api/core-service-ebtp-updownload/v1/attachment/find', {
-    method: 'POST',
-    data: {...params}
-  });
-}