boyue2025/dbd-meeting-wx-small
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting-wx-small.git synced 2025-06-21 15:29:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

测试问题修复

Browse Source 
修复部分测试中发现问题；
加入跳转功能
This commit is contained in:
471615499@qq.com 2024-09-29 20:45:00 +08:00
parent f0f0bb0c8e
commit d4d9984851
14 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
miniprogram/pages/index/index.js
View File

@ -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 => {

4
miniprogram/pages/index/index.wxml
View File

@ -36,9 +36,9 @@
</view>
<view class="infoView">
<view class="itemView" wx:for="{{infoList}}" wx:for-item="item" wx:key="*this" data-obj="{{item}}" bind:tap="jumpInfoDetail">
<view class="contentView ellipsisFont">
<view class="contentView">
<view class="title">消息提醒</view>
<view class="msg ellipsisFont">{{item.content}}</view>
<view class="msg">{{item.content}}</view>
<view class="time">{{item.createTime}}</view>
</view>
</view>

2
miniprogram/pages/index/index.wxss
View File

@ -168,7 +168,7 @@
.infoView .itemView .contentView .time {
font-size: 24rpx;
color: gray;
margin-top: 4rpx
margin-top: 10rpx
}

2
miniprogram/pages/meeting/index/index.js
View File

@ -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(),

4
miniprogram/pages/meeting/meetingReservation/meetingReservation.js
View File

@ -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

9
miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
View File

@ -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
})

14
miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
View File

@ -44,43 +44,43 @@
<view class="itemView">
<view class="label">会议名称</view>
<view class="content">
<van-field value="{{ detail.title }}" placeholder="请输入会议名称" clearable input-align="right" data-name="title" bind:change="inputChange" />
<van-field value="{{ detail.title }}" placeholder="请输入会议名称" clearable input-align="right" data-name="title" bind:change="inputChange" border="{{ false }}" />
</view>
</view>
<view class="itemView">
<view class="label">参会人数</view>
<view class="content">
<van-field value="{{ detail.personNum }}" placeholder="请输入参会人数" type="number" clearable input-align="right" data-name="personNum" bind:change="inputChange" />
<van-field value="{{ detail.personNum }}" placeholder="请输入参会人数" type="number" clearable input-align="right" data-name="personNum" bind:change="inputChange" border="{{ false }}" />
</view>
</view>
<view class="itemView">
<view class="label">参会领导</view>
<view class="content">
<van-field value="{{ detail.leader }}" placeholder="请输入参会领导" clearable input-align="right" data-name="leader" bind:change="inputChange" />
<van-field value="{{ detail.leader }}" placeholder="请输入参会领导" clearable input-align="right" data-name="leader" bind:change="inputChange" border="{{ false }}" />
</view>
</view>
<view class="itemView">
<view class="label">预约部门</view>
<view class="content">
<van-field value="{{ detail.depName }}" placeholder="点击选择部门" readonly clearable bind:click-input="chooseDep" input-align="right" data-name="depName" />
<van-field value="{{ detail.depName }}" placeholder="点击选择部门" readonly clearable bind:click-input="chooseDep" input-align="right" data-name="depName" border="{{ false }}" />
</view>
</view>
<view class="itemView">
<view class="label">预约人</view>
<view class="content">
<van-field value="{{ detail.orderUser }}" placeholder="请输入预约人" clearable input-align="right" data-name="orderUser" bind:change="inputChange" />
<van-field value="{{ detail.orderUser }}" placeholder="请输入预约人" clearable input-align="right" data-name="orderUser" bind:change="inputChange" border="{{ false }}" />
</view>
</view>
<view class="itemView">
<view class="label">联系方式</view>
<view class="content">
<van-field value="{{ detail.orderTel }}" placeholder="请输入联系方式" clearable input-align="right" data-name="orderTel" bind:change="inputChange" />
<van-field value="{{ detail.orderTel }}" placeholder="请输入联系方式" clearable input-align="right" data-name="orderTel" bind:change="inputChange" border="{{ false }}" />
</view>
</view>
<view class="itemView">
<view class="label">备注（选填）</view>
<view class="content">
<van-field value="{{ detail.remark }}" placeholder="请输入备注" clearable input-align="right" data-name="remark" bind:change="inputChange" />
<van-field value="{{ detail.remark }}" placeholder="请输入备注" clearable input-align="right" data-name="remark" bind:change="inputChange" border="{{ false }}" />
</view>
</view>
<view class="itemView" bind:tap="jumpMeetingFacilities">

13
miniprogram/pages/meeting/meetingRoom/meetingRoom.js
View File

@ -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,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

2
miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
View File

@ -28,7 +28,7 @@
<view class="resView">
<view class="leftLineTitle">预约情况</view>
<van-cell-group>
<van-cell wx:for="{{recordList}}" title="{{item.date}}" value="{{item.time}}" label="{{item.userOrg}} | {{item.bookingUserName}} | {{item.bookingUserPhone}}" />
<van-cell bind:click="goResInfo" data-id="{{item.id}}" wx:for="{{recordList}}" title="{{item.date}}" value="{{item.time}}" label="{{item.userOrg}} | {{item.bookingUserName}} | {{item.bookingUserPhone}}" />
</van-cell-group>
</view>

2
miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
View File

@ -67,7 +67,7 @@
<view class="content">{{detail.remark}}</view>
</view>
<view class="serviceItemView">
<view class="serviceItemView" style="display: none;">
<view class="label">会议室设备</view>
<view class="serviceItem" wx:for="{{detail.roomDevice}}" wx:key="*this">
<view class="name">{{item}}</view>

2
miniprogram/pages/meeting/reservationRecord/service/service.js
View File

@ -248,7 +248,7 @@ Page({
// 审核通过，可以取消，不允许修改
showCancel = true
showStaff = true
statusName = '已通过'
statusName = '待开始'
}
if (statusValue == 11) {
// 已结束

13
miniprogram/pages/my/info/info.js
View File

@ -115,6 +115,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 => {

4
miniprogram/pages/my/info/info.wxml
View File

@ -11,9 +11,9 @@
<view class="itemView {{item.read != '1' ? 'activity' : ''}} " wx:for="{{info.dataList}}" wx:for-item="item" wx:key="*this">
<van-checkbox wx:if="{{ showEdit }}" value="{{ checkedId[item.id] }}" data-obj="{{item}}" bind:change="changeCheck"></van-checkbox>
<view class="contentView ellipsisFont" data-obj="{{item}}" bind:tap="jumpInfoDetail">
<view class="contentView" data-obj="{{item}}" bind:tap="jumpInfoDetail">
<view class="title">消息提醒</view>
<view class="msg ellipsisFont">{{item.content}}</view>
<view class="msg">{{item.content}}</view>
<view class="time">{{item.createTime}}</view>
</view>
<van-icon class="arrow" name="arrow" color="#c3c3c3" size="40rpx" data-obj="{{item}}" bind:tap="jumpInfoDetail" />

2
miniprogram/pages/my/info/info.wxss
View File

@ -80,7 +80,7 @@
.infoView .itemView .contentView .time {
font-size: 24rpx;
color: gray;
margin-top: 4rpx
margin-top: 15rpx
}