From b1aae6175bc74fbd87b0831e7e32cb05f1302843 Mon Sep 17 00:00:00 2001 From: zhangzhuliang <577851561@qq.com> Date: Thu, 11 Aug 2022 14:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/RoomExamineAdmin.vue | 330 +++++ .../views/modules/myAgent/ConferenceRoom.vue | 381 ++++++ front/src/api/home.js | 33 + front/src/assets/home/jingao.png | Bin 0 -> 705 bytes front/src/views/home/DetailsPageconetent.vue | 12 +- front/src/views/home/infrastructurePage.vue | 1209 ++++++++++++++--- 6 files changed, 1772 insertions(+), 193 deletions(-) create mode 100644 back/src/views/modules/activiti/RoomExamineAdmin.vue create mode 100644 back/src/views/modules/myAgent/ConferenceRoom.vue create mode 100644 front/src/assets/home/jingao.png diff --git a/back/src/views/modules/activiti/RoomExamineAdmin.vue b/back/src/views/modules/activiti/RoomExamineAdmin.vue new file mode 100644 index 00000000..ac6de099 --- /dev/null +++ b/back/src/views/modules/activiti/RoomExamineAdmin.vue @@ -0,0 +1,330 @@ + + + + + + + + + 查询 + + + + + + + + + + + + + {{ scope.row.state == '1' ? '处理' : '详情' }} + + + + + + + + 处理结果 + + + + 审核结果:{{ lookData.state === '2' ? '通过' : '不通过' }} + + + 审核意见:{{ lookData.auditViem }} + + + 预约信息 + + + + 预约日期:{{ lookData.bookDate }} + + 预约时段:{{ lookData.startTime }}-{{ lookData.endTime }} + + 预约人:{{ lookData.name }} + 联系方式:{{ lookData.phone }} + 预约部门:{{ lookData.dept }} + + + 使用事项:{{ lookData.matter }} + + + + + 附件: + 下载 + + + + + + 预约信息 + + + 预约日期:{{ lookData.bookDate }} + 预约时段:{{ lookData.startTime }}-{{ lookData.endTime }} + + + + 申请人:{{ lookData.name }} + 联系方式:{{ lookData.phone }} + 申请部门:{{ lookData.dept }} + + + 使用事项:{{ lookData.matter }} + + + 审核结果: + + 通过 + 不通过 + + + + 审核意见: + + + + + + + + + + + diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue new file mode 100644 index 00000000..547c02ea --- /dev/null +++ b/back/src/views/modules/myAgent/ConferenceRoom.vue @@ -0,0 +1,381 @@ + + + + + 会议室管理 + 新增 + + + + + + + + + + + 详情 + {{ $t('update') }} + {{ $t('delete') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 支持图片类型,且不超过500kb + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/front/src/api/home.js b/front/src/api/home.js index ca2b548a..fdf6774b 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -370,6 +370,39 @@ export function getDevelopDocTree(params) { params, }) } + +//会议室查询接口 +export function getRoomSearch(params) { + return request({ + url: '/bookMeeting/list', + method: 'get', + params, + }) +} +//预约弹框选择日期接口 +export function getDate(params) { + return request({ + url: '/bookMeeting/availableDate', + method: 'get', + params, + }) +} +//预约提交 +export function setSubmit(data) { + return request({ + url: '/bookMeeting', + method: 'post', + data, + }) +} +//预约结果查询按钮 +export function getYuyue(params) { + return request({ + url: '/bookMeeting/page', + method: 'get', + params, + }) +} // 能力广场 应用资源 export function selectAppList(params) { return request({ diff --git a/front/src/assets/home/jingao.png b/front/src/assets/home/jingao.png new file mode 100644 index 0000000000000000000000000000000000000000..965bae32b3e21e736446396b0fd50ca42bcdd911 GIT binary patch literal 705 zcmV;y0zUnTP)Oki#WHTAxsa2h~%TVj9$97p6m#`n(VzCxurKs?x% z4>bhuemMI20DvE-%20_)Hao?D5B59$Q36H$mVnDiz7IJ&@Xhg0hoMDFj*!Yk-c_UF zKr^2^0(!=GE)4V==||2!Pe=-C#TdPKxcC;{)yZnQ%iR z;F2Y_0fT2*NA)(RR_uj7!$B5Y_#6gPNhGPB)!-k?JMgMui-5}(KM2T%v#!6Rxvs^O zIL{30&Q`t4&9<^FCbTw>^VQ&fOE5BahMKW+3D{0tLIYhn*SpYcE7@Wkw3*0NgL|>y zq6J%#iKkSGB&DJvHEsc}Pe<97Gs2h?8CSiG1ur&l0S)f%cm1j5fEWAnL^vv)0r(vY zu0K+p4*_Sp=I8w3!H{YKoTJMkbFR7?ofdf;jebLAxZ85v8isl^jMkI6s=m?g9+Yf; z1c46)j(52EcEoO8sR!0EDMvNHPo$OpUQ<(zWvP$XY)Wp@pik0DuK~{+$u7W`Wvz7G z>F<16e81uB8cl;XU_O!xiiI1%wV<4J&3eZ8;+8Bdcl3dD-%s<;1i nHrv&=ldYrTPJmYS6$AeP8t(fSMaSsI00000NkvXXu0mjf6-zuD literal 0 HcmV?d00001 diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index a43b2eaf..9b7ec2b5 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -6,7 +6,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -742,6 +742,12 @@ export default defineComponent({ setup() { + //会议室传的标识6 + const flag = ref('') + + const handleAdd = (value) => { + flag.value = value + } const titleName = ref(titleNameArray) const openMonitor = () => { @@ -1446,6 +1452,8 @@ getShoppingCartList, whoShow1, applyAll, + handleAdd, + flag, abilitySquare, visibleAbilitySquare, showAbilitySquare, diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 99519f49..f0b4b50a 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -27,201 +27,537 @@ - - - - - - - - - - 备选 - {{ pagination.total }} - 个 - - - - 已选 - {{ selectedRowKeys.length }} - 个 - + + + + + 会议室预约 + + + 预约结果 + - - - + + 会议室搜索 重置 - - - - 批量预览 - - - - 添加至申购车 - - - - 一键申请 - - - - - - - - + + 会议室列表 + + 可用时间查询 + + + + + + + + + + - 预览 - - - - - - - - - - - 控制台 - - - 申请 - - 详情 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + {{ item.name }} + + 房间号:{{ item.num }} + 可容纳人数:{{ item.capacity }} + 面积:{{ item.area }} + + + {{ item.description }} + + + + 预约 + + + + + + + + + + {{ record.bookDate }} {{ record.startTime }}-{{ + record.endTime + }} + + + + + {{ + record.state == 2 + ? '通过' + : record.state == 1 + ? '审核中' + : '不通过' + }} + + + + 查看详情 + + + + + + + 预约结果 + + + + 审核结果:{{ lookData.state === '2' ? '通过' : '不通过' }} + + + 审核意见:{{ lookData.auditViem }} + + + 预约信息 + + + + 预约时段:{{ lookData.bookDate }} {{ lookData.startTime }}-{{ + lookData.endTime + }} + + - {{ wrj.name }} - - - {{ key + ':' + value }} + 预约人:{{ lookData.name }} + 联系方式:{{ lookData.phone }} + 预约部门:{{ lookData.dept }} - - - - + + 使用事项:{{ lookData.matter }} + + + + + + + {})" + > + + + + + + 当日会议室可用时段:{{ roomDateList[0] }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 选择上传附件 + + + 支持doc、docx、PDF等格式支撑材料上传,文件大小不超过100M + + + + + + + 取消 + + 提交 + + + + + + + + + + + + + + + + 备选 + {{ pagination.total }} + 个 + + + + 已选 + {{ selectedRowKeys.length }} + 个 + + + + + + + + + 重置 + + + + + + 批量预览 + + + + 添加至申购车 + + + + 一键申请 + + + + + + + + + + 预览 + + + + + + + + + + + 控制台 + + + 申请 + + 详情 + + + + + + + + + + + + + + + + + + + + + + + + + + + - {{ key }} + {{ wrj.name }} - {{ key2 + ':' + value }} + {{ key + ':' + value }} - - - - {{ key + ':' + db }} - - - - - + + + + + + + {{ key }} + + + {{ key2 + ':' + value }} + + + + + {{ key + ':' + db }} + + + + + +
- 备选 - {{ pagination.total }} - 个 -
- 已选 - {{ selectedRowKeys.length }} - 个 -
+ 备选 + {{ pagination.total }} + 个 +
+ 已选 + {{ selectedRowKeys.length }} + 个 +