查看修改

src/pages/ElecEvalReserve/index.tsx

@@ -7,13 +7,21 @@ import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
 import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation';
 
 const { TabPane } = Tabs;
-
+const statusEnum = {
+  //"状态：-1-待确认 0-未开启 1-进行中 2-已结束 3-已取消 4-结束未使用"
+  '-1': { text: '待确认' },
+  '0': { text: '未开启' },
+  '1': { text: '进行中' },
+  '2': { text: '已结束' },
+  '3': { text: '已取消' },
+  '4': { text: '结束未使用' },
+};
 const Index: React.FC<{}> = () => {
   const checkRelationRef = useRef<ActionType>(); //操作数据后刷新列表
   const [areaNameList, setAreaNameList] = useState<any>();
   const [areaList, setAreaList] = useState<any>();
   //预约id
-  const [meetId, setMeetId] = useState<string>("");
+  const [meetId, setMeetId] = useState<string>('');
   //预约弹窗
   const [modalVisible, setModalVisible] = useState<boolean>(false);
   //刷新参数
@@ -37,29 +45,28 @@ const Index: React.FC<{}> = () => {
         let areaNameList = {};
         setAreaList(res.data);
         //将拿到的返回值遍历
-        res.data.map((item: { id: string | number; areaName: any; })=>{
+        res.data.map((item: { id: string | number; areaName: any }) => {
           //使用接口返回值的id做为 代替原本的0，1
           areaNameList[item.id] = {
             //使用接口返回值中的overdueValue属性作为原本的text:后面的值
             text: item.areaName,
+          };
+        });
+        setAreaNameList(areaNameList);
       }
-        })
+    });
-        setAreaNameList(areaNameList)
-      }
-    })
   };
   //查看预约
   const viewMeet = (id: any) => {
     setMeetId(id);
     setModalVisible(true);
-  }
+  };
   /**
    *  取消预约
    * @param record
    */
   const cancel = async (record: any) => {
-    
+    cancelReserve(record.id).then((res) => {
-    cancelReserve(record.id).then(res => {
       if (res.code == 200 && res.data) {
         message.success('预约取消成功');
       }
@@ -121,6 +128,14 @@ const Index: React.FC<{}> = () => {
       search: false,
       width: '10%',
     },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: '10%',
+      valueType: 'select',
+      valueEnum: statusEnum,
+      search: true,
+    },
     {
       title: '操作',
       width: '7%',
@@ -128,7 +143,15 @@ const Index: React.FC<{}> = () => {
       render: (text: any, record: any) => {
         return (
           <>
-            <Button hidden={ record.status > 0 } type="text" onClick={() => cancel(record)} danger>
+            <Button type="text" onClick={() => viewMeet(record.id)} danger>
+              查看
+            </Button>
+            <Button
+              hidden={record.status > 0 && record.timeOut == '1'}
+              type="text"
+              onClick={() => cancel(record)}
+              danger
+            >
               取消预约
             </Button>
           </>
@@ -196,31 +219,32 @@ const Index: React.FC<{}> = () => {
       width: '7%',
       search: false,
       render: (text: any, record: any) => {
-        
         return (
           <>
             <Button type="text" onClick={() => viewMeet(record.id)} danger>
               查看
             </Button>
-            <Button hidden={ record.status > 0 } type="text" onClick={() => cancel(record)} danger>
+            <Button
+              hidden={record.status > 0 && record.timeOut == '1'}
+              type="text"
+              onClick={() => cancel(record)}
+              danger
+            >
               取消预约
             </Button>
           </>
         );
-        
-
-
       },
     },
   ];
 
   return (
     <>
-
       <Card title="预约管理">
         <Tabs defaultActiveKey="1">
           <TabPane tab="评标预约" key="1">
-          {areaNameList && <ProTable
+            {areaNameList && (
+              <ProTable
                 actionRef={checkRelationRef}
                 className="proSearch"
                 columns={columns}
@@ -280,10 +304,12 @@ const Index: React.FC<{}> = () => {
                   showSizeChanger: false,
                 }} //默认显示条数
                 toolBarRender={false}
-          />}
+              />
+            )}
           </TabPane>
           <TabPane tab="会议预约" key="2">
-          {areaNameList && <ProTable
+            {areaNameList && (
+              <ProTable
                 className="proSearch"
                 columns={otherColumns}
                 params={{ reserveType: 'meeting' }}
@@ -317,14 +343,27 @@ const Index: React.FC<{}> = () => {
                   showSizeChanger: false,
                 }} //默认显示条数
                 toolBarRender={false}
-          />}
+              />
+            )}
           </TabPane>
         </Tabs>
-      {modalVisible && <MeetingReservation modalVisible={modalVisible} onCancel={() => { setModalVisible(false);  }} roomList={areaList} status={'2'} meetId={meetId} onSubmit={() => { setModalVisible(false); setRefresh(refresh => refresh + 1) }} />}
+        {modalVisible && (
-
+          <MeetingReservation
+            modalVisible={modalVisible}
+            onCancel={() => {
+              setModalVisible(false);
+            }}
+            roomList={areaList}
+            status={'2'}
+            meetId={meetId}
+            onSubmit={() => {
+              setModalVisible(false);
+              setRefresh((refresh) => refresh + 1);
+            }}
+          />
+        )}
       </Card>
     </>
-    
   );
 };
 export default Index