From d4d9984851bec28f5b3979a1307ce127df990528 Mon Sep 17 00:00:00 2001 From: "471615499@qq.com" Date: Sun, 29 Sep 2024 20:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复部分测试中发现问题； 加入跳转功能 --- miniprogram/pages/index/index.js | 13 +++++++++++++ miniprogram/pages/index/index.wxml | 4 ++-- miniprogram/pages/index/index.wxss | 2 +- miniprogram/pages/meeting/index/index.js | 2 +- .../meetingReservation/meetingReservation.js | 4 ++-- .../meetingRoom/meetingOrder/meetingOrder.js | 9 +++++++-- .../meetingRoom/meetingOrder/meetingOrder.wxml | 14 +++++++------- .../pages/meeting/meetingRoom/meetingRoom.js | 13 +++++++++++-- .../pages/meeting/meetingRoom/meetingRoom.wxml | 2 +- .../meetingRecord/meetingDetail/meetingDetail.wxml | 2 +- .../meeting/reservationRecord/service/service.js | 2 +- miniprogram/pages/my/info/info.js | 13 +++++++++++++ miniprogram/pages/my/info/info.wxml | 4 ++-- miniprogram/pages/my/info/info.wxss | 2 +- 14 files changed, 63 insertions(+), 23 deletions(-) diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index ef384fa..f316c31 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -282,6 +282,19 @@ Page({ // 此处为维修单，要跳转到case url = `/pages/reportRepair/repair/case/case?id=${repairId}` } + + if ((title.includes('您收到会议预约') && title.includes('待审核')) || (title.includes('会议预约') && title.includes('已取消'))) { + // 此处为管理员收到的会议审核 + url = "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail?act=approve&id=" + repairId + } + if (title.includes('您的会议预约') && (title.includes('被驳回') || title.includes('已被管理员修改') || title.includes('已审核通过') || title.includes('即将开始'))) { + // 此处为预约人收到的会议预约 + url = "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail?id=" + repairId + } + if (title.includes('会议预约') && title.includes('指定您为会务负责人')) { + // 此处为管理员收到的会议审核 + url = "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail?act=serve&id=" + repairId + } repairRemindReadRq({ id }).then(res => { diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 0dc35c5..8e22141 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -36,9 +36,9 @@ - + 消息提醒 - {{item.content}} + {{item.content}} {{item.createTime}} diff --git a/miniprogram/pages/index/index.wxss b/miniprogram/pages/index/index.wxss index f87ff4b..85d3190 100644 --- a/miniprogram/pages/index/index.wxss +++ b/miniprogram/pages/index/index.wxss @@ -168,7 +168,7 @@ .infoView .itemView .contentView .time { font-size: 24rpx; color: gray; - margin-top: 4rpx + margin-top: 10rpx } diff --git a/miniprogram/pages/meeting/index/index.js b/miniprogram/pages/meeting/index/index.js index 5d1d902..a8744a6 100644 --- a/miniprogram/pages/meeting/index/index.js +++ b/miniprogram/pages/meeting/index/index.js @@ -34,7 +34,7 @@ Page({ name: "会务服务", img: "/profile/static/meeting/index/serve.png", path: "/pages/meeting/reservationRecord/service/service", - visible: true + visible: false }], timeShow: false, currentDate: new Date().getTime(), diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js index 29d1141..3308119 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js @@ -97,8 +97,8 @@ Page({ dateStr: _year + '-' + _month + '-' + _day, userDetail: userDetail }) - if (userDetail.roomRole != 5 && options.depId == '') { - // 非管理员必须认证单位 + if (options.rId == '' && (userDetail.roomRole != 5 && options.depId == '')) { + // 新增时，非管理员必须认证单位 Notify('非法操作！') wx.navigateBack() return diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index 4967f5d..47fde8d 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -102,7 +102,9 @@ Page({ if (_meetingRoomId !== null) { _this.getRoomInfo(_meetingRoomId) } - selectReservationByIdRq({id: _dataId}).then(res => { + selectReservationByIdRq({ + id: _dataId + }).then(res => { console.log('编辑，获取信息', res) let recordDetail = res.mr let roomDetail = res.room @@ -333,7 +335,10 @@ Page({ }) }, chooseDep() { - console.log(111) + // 非管理员无法选择 + if (this.data.userData.roomRole != 5) { + return + } wx.navigateTo({ url: '/pages/meeting/meetingRoom/meetingDep/meetingDep?depId=' + this.data.depId }) diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index 2a8202f..02b8642 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -44,43 +44,43 @@ 会议名称 - + 参会人数 - + 参会领导 - + 预约部门 - + 预约人 - + 联系方式 - + 备注（选填） - + diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js index 2863c59..f6ebad8 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js @@ -78,7 +78,7 @@ Page({ const _year = sTimeData.getFullYear() const _month = sTimeData.getMonth() + 1 // 月份从0开始，需要+1 const _day = sTimeData.getDate() - eachObj['date'] = _year + '-' + _month.toString().padStart(2, '0') + '-' + _day + eachObj['date'] = _year + '-' + _month.toString().padStart(2, '0') + '-' + _day eachObj['time'] = sTimeFormat + ' - ' + eTimeFormat _recordList.push(eachObj) } @@ -182,7 +182,16 @@ Page({ url: "/pages/meeting/meetingRoom/meetingBooked/meetingBooked?meetingRoomId=" + meetingRoomId + '&time=' + time + '&timeRange=' + timeRange + '&rId=' + this.data.rId + '&dep=' + this.data.dep + '&depId=' + this.data.depId, }) }, - + goResInfo(e) { + if (this.data.userDetail.roomRole != 5) { + return + } + let id = e.currentTarget.dataset.id + // 跳转到审核页面 + wx.navigateTo({ + url: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail?act=approve&id=" + id, + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml index 451d3b5..f94c3a6 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml @@ -28,7 +28,7 @@ 预约情况 - + diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml index 6746610..7a714f7 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml @@ -67,7 +67,7 @@ {{detail.remark}} - +