预约评标室

config/proxy.ts

@@ -17,6 +17,11 @@ export default {
     //   changeOrigin: true,
     //   pathRewrite: { '^': '' },
     // },
+    '/v1/eval/room/reserve/list': {
+      target: 'http://localhost:18017',//连接天宫的ng
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
     '/api/*': {
       target: 'http://10.242.31.158:18022',//连接天宫的ng
       changeOrigin: true,

config/router.config.ts

@@ -109,6 +109,11 @@ export default [
             path: '/',
             redirect: '/userexpert/login',
           },
+          {//委托撤回
+            name: 'ElecEvalReserve',
+            path: '/ElecEvalReserve',
+            component: './ElecEvalReserve',
+          },
           ...home,//各角色主页
           ...menuaZhaoBiao,//项目菜单所有路由
           {//问卷调查

src/pages/ElecEvalReserve/index.tsx

@@ -26,47 +26,51 @@ const Index: React.FC<{}> = () => {
       dataIndex: 'index',
       valueType: 'index',
       search: false,
-      width: 50,
+      width: '2%',
     },
     {
       title: '评标室',
       dataIndex: 'areaName',
+      search: true,
+      width: '15%',
     },
     {
       title: '预约开始时间',
       dataIndex: 'reserveStartDate',
-      search: false,
+      search: true,
-      width: '5%',
+      valueType: 'dateTime',
+      width: '15%',
     },
     {
       title: '预约结束时间',
       dataIndex: 'reserveEndDate',
-      search: false,
+      search: true,
-      width: '7%',
+      valueType: 'dateTime',
+      width: '15%',
     },
     {
       title: '预约人',
       dataIndex: 'reserveBy',
-      width: '20%',
+      width: '5%',
       search: false
     },
     {
       title: '预约人联系方式', 
       dataIndex: 'reserveContactNumber',
-      width: '10%',
+      width: '5%',
       search: false
     },
     {
       title: '项目名称',
       dataIndex: 'projectName',
       search: false,
-      width: '7%'
+      width: '10%'
     },
     {
       title: '标段名称',
       dataIndex: 'sectionNames',
       search: false,
-      width: '7%'
+      width: '10%'
     }, 
     {
       title: '操作',
@@ -86,7 +90,56 @@ const Index: React.FC<{}> = () => {
   ];
   const otherColumns: any[] = [  //会议室预约
     
-    
+  {
+    title: '序号',
+    dataIndex: 'index',
+    valueType: 'index',
+    search: false,
+    width: 50,
+  },
+  {
+    title: '会议室名称',
+    dataIndex: 'areaName',
+  },
+  {
+    title: '预约开始时间',
+    dataIndex: 'reserveStartDate',
+    search: false,
+    width: '5%',
+  },
+  {
+    title: '预约结束时间',
+    dataIndex: 'reserveEndDate',
+    search: false,
+    width: '7%',
+  },
+  {
+    title: '预约人',
+    dataIndex: 'reserveBy',
+    width: '20%',
+    search: false
+  },
+  {
+    title: '预约人联系方式', 
+    dataIndex: 'reserveContactNumber',
+    width: '10%',
+    search: false
+  },
+  {
+    title: '操作',
+    width: '7%',
+    search: false,
+    render: (text: any, record: any) => {
+
+      return (
+        <>
+          <Button hidden={btnAuthority(['ebtp-supplier'])} type="text" onClick={() => {}} danger>取消预约</Button>
+          
+        </>
+      )
+      
+    }
+  },
   ];
   
 
@@ -105,10 +158,26 @@ const Index: React.FC<{}> = () => {
               actionRef={checkRelationRef}
               className="proSearch"
               columns={columns}
-              params={{ }}
+              params={{ "reserveType": "eval" }}
               size='small'
-              request={async (params: any) =>
+              request={async (params) =>
-                {}
+                await reserveList(params).then((res) => {
+                  if (res.code == 200) {
+                    let data = res.data;
+                    return Promise.resolve({
+                      data: data.records,
+                      success: res.success,
+                      total: res.data.total,
+                      current: res.data.current,
+                    });
+                  }
+                  return Promise.resolve({
+                    data: [],
+                    success: false,
+                    total: 0,
+                    current: 1,
+                  });
+                })
               }
               search={{
                 filterType: "query",
@@ -118,8 +187,7 @@ const Index: React.FC<{}> = () => {
                       key="resetText"
                       onClick={() => {
                         form?.setFieldsValue({
-                          projectName: null,
+                        
-                          bidMethodDict: null,
                           current: 1,
                         })
                         form?.submit();
@@ -147,13 +215,29 @@ const Index: React.FC<{}> = () => {
           </TabPane>
           <TabPane tab="会议预约" key="2">
             <ProTable
-              size='small'
               className="proSearch"
               columns={otherColumns}
-              params={{ "procurementMode": proTypeCode }}
+              params={{ "reserveType": "meeting" }}
-              request={async (params: any) =>
+              size='small'
-                {}
+              request={async (params) =>
-                }
+                await reserveList(params).then((res) => {
+                  if (res.code == 200) {
+                    let data = res.data;
+                    return Promise.resolve({
+                      data: data.records,
+                      success: res.success,
+                      total: res.data.total,
+                      current: res.data.current,
+                    });
+                  }
+                  return Promise.resolve({
+                    data: [],
+                    success: false,
+                    total: 0,
+                    current: 1,
+                  });
+                })
+              }
               pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
               toolBarRender={false}
             />

src/pages/ElecEvalReserve/service.ts

@@ -0,0 +1,16 @@
+import request from '@/utils/request';
+
+export async function reserveList(data: any) { // 查询会议室/评标室预约情况
+  return request('/v1/eval/room/reserve/list', {
+    method: 'post',
+    data: {...data,pageNo: data.current}
+  });
+}
+
+export async function roomList(data: any) { // 查询评标室列表
+  ///api/biz-service-ebtp-evaluation
+  return request('http://localhost:18017/v1/elec/eval/room/list', {
+    method: 'get',
+    params: data
+  });
+}

src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/service.ts

@@ -1,8 +0,0 @@
-import request from '@/utils/request';
-
-export async function reserveList(data: any) { // 查询会议室/评标室
-  return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/list', {
-    method: 'get',
-    data: data
-  });
-}