7.25 单一简化 确认评审结果修改

src/pages/Calibration/BidAssessmentResults/index.tsx

@@ -11,12 +11,14 @@ import { isEmpty } from '@/utils/CommonUtils';
 const BidAssessmentResults: React.FC<{}> = (props) => {
   const [Refresh, setRefresh] = useState<number>(0);
   const { Panel } = Collapse;
-  const [ListData, setListData] = useState<any>();
+  const [ListData, setListData] = useState<any[]>([]);
   const [assessRoomId, setAssessRoomId] = useState<any>();
   const [currentTable, setCurrentTable] = useState<boolean>(false);
   const [spintype, setSpintype] = useState<boolean>(false);
   //查询条件-包件名称
   const [name, setName] = useState<string>('');
+  //折叠面板
+  const [collapseActiveKeys, setCollapseActiveKeys] = useState<any[]>(['0']);
 
   const FormItem = Form.Item;
   const { Option } = Select;
@@ -101,9 +103,14 @@ const BidAssessmentResults: React.FC<{}> = (props) => {
     setCurrentTable(true);
   }
 
+  //折叠面板change
+  const onCollapseChange = (key: any) => {
+    setCollapseActiveKeys(key);
+  };
+
   //确认评审结果ListRender封装
-  const ResultListRender = (props: { item: any, index: any, setSpintype: (value: boolean) => void, getResultList: (record: any) => void, ListData: any, pushResult: (record: any) => void }) => {
+  const ResultListRender = (props: { item: any, setSpintype: (value: boolean) => void, getResultList: (record: any) => void, ListData: any, pushResult: (record: any) => void }) => {
-    const { item, index, setSpintype, getResultList, ListData, pushResult } = props;
+    const { item, setSpintype, getResultList, ListData, pushResult } = props;
     //单一来源简化
     const [form] = Form.useForm();
     //综合得分展开关闭
@@ -167,9 +174,6 @@ const BidAssessmentResults: React.FC<{}> = (props) => {
     }
 
     return (
-      <Collapse defaultActiveKey={index == 0 ? item.sectionId : ""} className="calibration-panel">
-        <Panel
-          header={item.sectionName} key={item.sectionId}>
       <List
         grid={{
           gutter: 16,
@@ -437,33 +441,9 @@ const BidAssessmentResults: React.FC<{}> = (props) => {
         }}
       >
       </List>
-        </Panel>
-      </Collapse>
     )
   }
 
-  const list = useMemo(() => {
-    return (
-      <List
-        grid={{
-          gutter: 16,
-          xs: 1,
-          sm: 1,
-          md: 1,
-          lg: 1,
-          xl: 1,
-          xxl: 1,
-        }}
-        style={{ paddingTop: "24px;" }}
-        itemLayout="vertical"
-        rowKey="sectionId"
-        dataSource={ListData}
-        renderItem={(item: any, index: any) => (
-          <ResultListRender item={item} index={index} key={index} setSpintype={(value) => { setSpintype(value); }} getResultList={getResultList} ListData={ListData} pushResult={pushResult} />
-        )}
-      />
-    )
-  }, [ListData])
   return (
     <>
       <Spin spinning={spintype}>
@@ -480,7 +460,13 @@ const BidAssessmentResults: React.FC<{}> = (props) => {
               }}>重置</Button>
             </Space>
           </div>
-          {list}
+          <Collapse activeKey={collapseActiveKeys} onChange={onCollapseChange} className="calibration-panel">
+            {ListData.map((item, index) => (
+              <Panel header={item.sectionName} key={index}>
+                <ResultListRender item={item} setSpintype={(value) => { setSpintype(value); }} getResultList={getResultList} ListData={ListData} pushResult={pushResult} />
+              </Panel>
+            ))}
+          </Collapse>
           <CurrentTable assessRoomId={assessRoomId} ChangeNoticeListVisible={currentTable}
             onCancel={() => setCurrentTable(false)} />
         </Card>