From a7ff7ccd9dd5dd7f1f7c633b50c0545c7cb9bace Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Thu, 11 Aug 2022 17:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AF=84=E6=A0=87=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/proxy.ts | 5 + config/router.config.ts | 5 + .../ElecEvalReserve/index.tsx | 124 +++++++++++++++--- src/pages/ElecEvalReserve/service.ts | 16 +++ .../ElecEvalRoom/ElecEvalReserve/service.ts | 8 -- 5 files changed, 130 insertions(+), 28 deletions(-) rename src/pages/{Evaluation/ElecEvalRoom => }/ElecEvalReserve/index.tsx (59%) create mode 100644 src/pages/ElecEvalReserve/service.ts delete mode 100644 src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/service.ts diff --git a/config/proxy.ts b/config/proxy.ts index 94ad589..d7a67ff 100644 --- a/config/proxy.ts +++ b/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, diff --git a/config/router.config.ts b/config/router.config.ts index 46b1726..2472fa1 100644 --- a/config/router.config.ts +++ b/config/router.config.ts @@ -109,6 +109,11 @@ export default [ path: '/', redirect: '/userexpert/login', }, + {//委托撤回 + name: 'ElecEvalReserve', + path: '/ElecEvalReserve', + component: './ElecEvalReserve', + }, ...home,//各角色主页 ...menuaZhaoBiao,//项目菜单所有路由 {//问卷调查 diff --git a/src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/index.tsx b/src/pages/ElecEvalReserve/index.tsx similarity index 59% rename from src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/index.tsx rename to src/pages/ElecEvalReserve/index.tsx index e28dc21..8f9831a 100644 --- a/src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/index.tsx +++ b/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, - width: '5%', + search: true, + valueType: 'dateTime', + width: '15%', }, { title: '预约结束时间', dataIndex: 'reserveEndDate', - search: false, - width: '7%', + search: true, + 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 ( + <> + + + + ) + + } + }, ]; @@ -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<{}> = () => { - {} - } + params={{ "reserveType": "meeting" }} + 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} /> diff --git a/src/pages/ElecEvalReserve/service.ts b/src/pages/ElecEvalReserve/service.ts new file mode 100644 index 0000000..8537586 --- /dev/null +++ b/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 + }); +} diff --git a/src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/service.ts b/src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/service.ts deleted file mode 100644 index d26f053..0000000 --- a/src/pages/Evaluation/ElecEvalRoom/ElecEvalReserve/service.ts +++ /dev/null @@ -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 - }); -}