From e9a1ceec31fab34dca003e02ae328bd3f519553e Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 1 Sep 2022 13:08:40 +0800
Subject: [PATCH] =?UTF-8?q?9.1=20=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ElecEvalReserve/index.tsx | 56 +++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/pages/ElecEvalReserve/index.tsx b/src/pages/ElecEvalReserve/index.tsx
index 2500dc7..466af84 100644
--- a/src/pages/ElecEvalReserve/index.tsx
+++ b/src/pages/ElecEvalReserve/index.tsx
@@ -18,6 +18,8 @@ const statusEnum = {
 };
 const Index: React.FC<{}> = () => {
   const checkRelationRef = useRef<ActionType>(); //操作数据后刷新列表
+  const meetingRelationRef = useRef<ActionType>(); //操作数据后刷新列表
+
   const [areaNameList, setAreaNameList] = useState<any>();
   const [areaList, setAreaList] = useState<any>();
   //预约id
@@ -26,7 +28,8 @@ const Index: React.FC<{}> = () => {
   const [modalVisible, setModalVisible] = useState<boolean>(false);
   //刷新参数
   const [refresh, setRefresh] = useState<number>(0);
-
+  //预约状态
+  const [meetStatus, setMeetStatus] = useState<string>("2");
   /*拉取数据*/
   useEffect(() => {
     initAreaNameList();
@@ -56,8 +59,15 @@ const Index: React.FC<{}> = () => {
       }
     });
   };
+  //新建预约
+  const createMeet = () => {
+    setMeetStatus("0");
+    setMeetId("");
+    setModalVisible(true);
+  }
   //查看预约
   const viewMeet = (id: any) => {
+    setMeetStatus("2");
     setMeetId(id);
     setModalVisible(true);
   };
@@ -310,14 +320,11 @@ const Index: React.FC<{}> = () => {
           <TabPane tab="会议预约" key="2">
             {areaNameList && (
               <ProTable
+                actionRef={meetingRelationRef}
                 className="proSearch"
                 columns={otherColumns}
                 params={{ reserveType: 'meeting' }}
                 size="small"
-                search={{
-                  labelWidth: 'auto',
-                  span: 4,
-                }}
                 request={async (params) =>
                   await reserveList(params).then((res) => {
                     if (res.code == 200) {
@@ -337,6 +344,42 @@ const Index: React.FC<{}> = () => {
                     });
                   })
                 }
+                search={{
+                  filterType: 'query',
+                  optionRender: (searchConfig: any, { form }) => {
+                    return [
+                      <Button
+                        key="resetText"
+                        onClick={() => {
+                          form?.setFieldsValue({
+                            current: 1,
+                          });
+                          form?.submit();
+                        }}
+                      >
+                        {searchConfig?.resetText}
+                      </Button>,
+                      <Button
+                        key="searchText"
+                        type="primary"
+                        onClick={() => {
+                          form?.submit();
+                        }}
+                      >
+                        {searchConfig?.searchText}
+                      </Button>,
+                      <Button
+                        key="addText"
+                        type="primary"
+                        onClick={() => createMeet()}
+                      >
+                        新增
+                      </Button>,
+                    ];
+                  },
+                  labelWidth: 'auto',
+                  span: 4,
+                }}
                 pagination={{
                   defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
                   defaultPageSize: 10,
@@ -354,9 +397,10 @@ const Index: React.FC<{}> = () => {
               setModalVisible(false);
             }}
             roomList={areaList}
-            status={'2'}
+            status={meetStatus}
             meetId={meetId}
             onSubmit={() => {
+              meetingRelationRef.current?.reload?.();
               setModalVisible(false);
               setRefresh((refresh) => refresh + 1);
             }}