Merge branch '20220518-折叠以后再展开才是实际的数据' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220507-MAC地址强控

src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx

@@ -69,15 +69,15 @@ const BidPublicityResult: React.FC<{}> = (props) => {
       title: '起草时间',
       dataIndex: 'createDate',
       // dataIndex: 'annoStartTime',
-      key:"annoStartTime",
-      align:'left',
+      key: "annoStartTime",
+      align: 'left',
       valueType: 'dateTime',
     },
     {
       title: '公示状态',
       dataIndex: 'status',
-      key:"status",
-      align:'left',
+      key: "status",
+      align: 'left',
       // valueEnum: {
       //   1: { text: '起草', status: '' },
       //   2: { text: '已提交', status: '' },
@@ -219,7 +219,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         if (res.data.length == 0) {
           message.warn("没有可关联的包件！")
         } else {
-          setUpdateChange('新建中选候选人公示')
+          setUpdateChange('新增招募结果公示')
           setType("new");
           setUpdateVisible(true);
         }
@@ -231,14 +231,14 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   }
   /*编辑招标公示*/
   const toEdit = (props: any) => {
-    setUpdateChange('编辑中选候选人公示')
+    setUpdateChange('编辑招募结果公示')
     setPkId(props.id);
     setType("edit");
     setUpdateVisible(true);
   }
   /*查看招标公示*/
   const toRead = (props: any) => {
-    setUpdateChange('查看中选候选人公示')
+    setUpdateChange('查看招募结果公示')
     setType("read");
     setPkId(props.id);
     setUpdateVisible(true);
@@ -317,9 +317,9 @@ const BidPublicityResult: React.FC<{}> = (props) => {
     setPageloading(true);
     //获取流程列表
     getApprProcessList(record.id).then(res => {
-      if(res?.code == 200) {
+      if (res?.code == 200) {
         const data = res?.data
-        if(data?.approval == true) {//打开选择流程界面
+        if (data?.approval == true) {//打开选择流程界面
           setRecordData(record)
           setApprovalData(data?.list)
           setApprovalVisible(true)
@@ -358,7 +358,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           size={"small"}
           loading={pageloading}
           toolBarRender={() => [
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新建中选候选人公示</Button>,
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新增招募结果公示</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"2"} onClick={() => { handleRemoveMore() }}>批量删除</Button>,
           ]}
           search={false}

src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx

@@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => {
                 return;
             }
             let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : [];
+            let params = { roomType };
             if (isNotEmpty(packageIds) && packageIds.length !== 0) {
                 //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系
-                getClarifyAnnoList(packageIds).then(res => {
+                getClarifyAnnoList(packageIds, params).then(res => {
                     if (res.code == 200) {
                         getRoomList({ sectionIdList: packageIds }).then((res2) => {
                             if (res2.code == 200) {

src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts

@@ -107,10 +107,11 @@ export function getSections(projectId: any, roomType: any) {
  * 根据标段id查询公告
  * @param data 
  */
-export function getClarifyAnnoList(data: any) {
+export function getClarifyAnnoList(data: any, params: any) {
     return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', {
         method: 'post',
-        data: data
+        data: data,
+        params: params,
     });
 }
 /**

src/pages/ZZhaoMu/Tender/UploadResponse/index.tsx

@@ -11,7 +11,6 @@ import { ExclamationCircleOutlined } from '@ant-design/icons';
 import SupplierCommitment from '@/pages/Tender/UploadResponse/components/SupplierCommitment';
 
 const Index: React.FC<{}> = () => {
-  const [dateList, setDateList] = useState([]);
   let projectId = getProId()
   const [expandedRowKeys, setExpandedRowKeys] = useState<ReactText[]>([0]);
   //供应商资质库显示状态
@@ -35,7 +34,7 @@ const Index: React.FC<{}> = () => {
     })
   }
 
-  let listDate = dateList?.map((item: any, index: any) => ({
+  let listRender = (list: any[]) => list?.map((item: any, index: any) => ({
     title: item.packageName + '—第' + item.roomSort + '轮',
     description: (
       <div>
@@ -77,9 +76,9 @@ const Index: React.FC<{}> = () => {
               await getPackages(params).then((res) => {
                 if (res.code == 200) {
                   let data = res.data;
-                  setDateList(res.data.records)
+                  // setDateList(res.data.records)
                   return Promise.resolve({
-                    data: data.records,
+                    data: listRender(data.records),
                     success: res.success,
                     total: res.data.total,
                     current: res.data.current,
@@ -98,7 +97,7 @@ const Index: React.FC<{}> = () => {
               showSizeChanger: true,
             }}
             expandable={{ expandedRowKeys, onExpandedRowsChange: setExpandedRowKeys, onExpand: changeList }}
-            dataSource={listDate}
+            // dataSource={listDate}
             metas={{
               title: {},
               content: {},