Merge branch 'fix_0731_2'

src/pages/Opening/ProjectManager/OpenList/index.tsx

@@ -242,9 +242,9 @@ const Sing: React.FC<{}> = () => {
     <Spin spinning={spin}>
       <div className='xsy-headerDiv pd24'>
         <h3 className="first-title floatLeft">{showNameT.kb}列表</h3>
-        <div className='xsy-rightDiv-struct'>
+        {/* <div className='xsy-rightDiv-struct'>
           <Button type="primary" onClick={() => window.open(`/bidOpening/bidOpening.html?&roomType=${roomType}`)}>虚拟大厅</Button>
-        </div>
+        </div> */}
       </div>
       <ProTable
         columns={columns}//表格

src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingDocumentList.tsx

@@ -1,7 +1,7 @@
 import { UnorderedListOutlined } from "@ant-design/icons"
 import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
 import tableProps from '@/utils/tableProps';
-import { Button, Card, Divider, message, Spin } from "antd"
+import { Button, Card, Divider, message, Modal, Popconfirm, Spin } from "antd"
 import React, { useEffect, useRef, useState } from "react"
 import BiddingDocument from "./components/BiddingDocument"
 import {
@@ -95,7 +95,9 @@ const BiddingDocumentList: React.FC<{}> = (props) => {
         let btn1 = (
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>修改</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toRemove(record)}>删除</Button>
+            <Popconfirm title="确定删除吗？" onConfirm={() => toRemove(record)}>
+              <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text">删除</Button>
+            </Popconfirm>
           </>
         );
         let btn2 = (
@@ -172,21 +174,31 @@ const BiddingDocumentList: React.FC<{}> = (props) => {
   }
   const toRemoveMore = () => {
     if (selectedRowsState.length != 0) {
-      setPageloading(true);
-      let param = []
-      for (const item of selectedRowsState) {
-        param.push(item.id);
-      }
-      removefile(param).then(res => {
-        if (res.code == 200) {
-          message.success('删除成功');
-        }
+      Modal.confirm({
+        title: '确定删除吗？',
+        onOk: () => {
+          setPageloading(true);
+          let param = []
+          for (const item of selectedRowsState) {
+            param.push(item.id);
+          }
+          removefile(param).then(res => {
+            if (res.code == 200) {
+              message.success('删除成功');
+            }
 
-        setPageloading(false);
-        setRefresh(Math.random() + 1)
-        setSelectedRows([]);
-        actionRef?.current?.reloadAndRest?.();
-      });
+            setPageloading(false);
+            setRefresh(Math.random() + 1)
+            setSelectedRows([]);
+            actionRef?.current?.reloadAndRest?.();
+          });
+        },
+        onCancel: () => {
+          setSelectedRows([]);
+        }
+      })
+    } else {
+      message.warn('请选择要删除的资审文件');
     }
 
   }