diff --git a/miniprogram/app.json b/miniprogram/app.json
index b7f274b..32f2fa6 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -76,7 +76,7 @@
"pages/meeting/reservationRecord/exhibitionRecord/list/list",
"pages/meeting/reservationRecord/exhibitionRecord/detail/detail",
"pages/meeting/meetingRoom/meetingService/meetingService",
-
+ "pages/meeting/meetingRoom/meetingStaff/meetingStaff",
"pages/reportRepair/index/index",
"pages/reportRepair/report/report",
"pages/reportRepair/query/record/record",
diff --git a/miniprogram/pages/meeting/index/index.js b/miniprogram/pages/meeting/index/index.js
index d399858..34bc44a 100644
--- a/miniprogram/pages/meeting/index/index.js
+++ b/miniprogram/pages/meeting/index/index.js
@@ -13,25 +13,25 @@ Page({
menuList: [{
type: "report",
name: "会议预约",
- img: "/profile/static/repair/index/my.png",
+ img: "/profile/static/meeting/index/reservation.png",
path: "/pages/meeting/meetingReservation/meetingReservation",
visible: true
}, {
type: "query",
name: "预约记录",
- img: "/profile/static/repair/index/query.png",
+ img: "/profile/static/meeting/index/record.png",
path: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord",
visible: true
}, {
type: "assign",
name: "会议审核",
- img: "/profile/static/repair/index/case.png",
+ img: "/profile/static/meeting/index/examine.png",
path: "/pages/meeting/reservationRecord/approve/approve",
visible: true
}, {
type: "repair",
name: "会务服务",
- img: "/profile/static/repair/index/repair.png",
+ img: "/profile/static/meeting/index/serve.png",
path: "/pages/meeting/reservationRecord/service/service",
visible: true
}],
diff --git a/miniprogram/pages/meeting/index/index.wxml b/miniprogram/pages/meeting/index/index.wxml
index ce4efb5..bb52429 100644
--- a/miniprogram/pages/meeting/index/index.wxml
+++ b/miniprogram/pages/meeting/index/index.wxml
@@ -2,7 +2,7 @@
-
+
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.js b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.js
new file mode 100644
index 0000000..0f51909
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.js
@@ -0,0 +1,163 @@
+const app = getApp()
+
+import Notify from '@vant/weapp/notify/notify';
+
+import {
+ getMeetingRoomServiceAndEquipmentRq,
+ queryServiceMsgRq
+} from "../../../../api/meeting/meetingRoom.js"
+
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ IMG_NAME: app.IMG_NAME,
+ rId: '',
+ checkUser: [],
+ staffMusicList: [{
+ id: 1,
+ name: '张三',
+ isSelect: false
+ }, {
+ id: 2,
+ name: '李四',
+ isSelect: false
+
+ }, {
+ id: 3,
+ name: '王五',
+ isSelect: false
+ }],
+ staffServeList: [{
+ id: 4,
+ name: '赵六',
+ isSelect: false
+ }, {
+ id: 5,
+ name: '朱七',
+ isSelect: false
+ }, {
+ id: 6,
+ name: '冯八',
+ isSelect: false
+ }]
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let _this = this
+ let rId = options.rId
+
+ // console.log(ser)
+ _this.setData({
+ rId: rId
+ })
+ // 获取数据
+ _this.getData()
+ },
+
+ // 获取数据
+ getData() {
+ let _this = this;
+ // ajax获取当前预约的人员以及会务人员列表
+
+ },
+
+ // 服务选择
+ checkBoxClick(e) {
+ let _this = this
+ console.log('checkBoxClick', e)
+ // get param
+ let id = e.target.dataset.id
+ let type = e.target.dataset.type
+ if (type === 'music') {
+ let staffMusicList = _this.data.staffMusicList.map(item => {
+ if (item.id == id) {
+ item.isSelect = !item.isSelect
+ }
+ return item
+ })
+ _this.setData({
+ staffMusicList
+ })
+ } else {
+ let staffServeList = _this.data.staffServeList.map(item => {
+ if (item.id == id) {
+ item.isSelect = !item.isSelect
+ }
+ return item
+ })
+ _this.setData({
+ staffServeList
+ })
+ }
+ },
+
+ // 确定
+ submit() {
+ let _this = this;
+ // 提交
+ console.log(_this.data.staffMusicList)
+ console.log(_this.data.staffServeList)
+ // let pages = getCurrentPages(); //获取page
+ // let prevPage = pages[pages.length - 2]; //上一个页面（父页面）
+ // prevPage.setData({
+ // serviceList: _this.data.serviceList
+ // })
+ // console.log(_this.data.serviceList)
+ wx.navigateBack()
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.json b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.json
new file mode 100644
index 0000000..f8180ed
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.json
@@ -0,0 +1,10 @@
+{
+ "usingComponents": {
+ "van-icon": "@vant/weapp/icon/index",
+ "van-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+ "van-field": "@vant/weapp/field/index",
+ "van-notify": "@vant/weapp/notify/index"
+ },
+ "navigationBarTitleText": "会务负责人"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.wxml b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.wxml
new file mode 100644
index 0000000..c880080
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.wxml
@@ -0,0 +1,28 @@
+
+
+
+
+ 音控组
+
+
+
+ {{item.name}}
+
+
+
+
+
+ 会务服务组
+
+
+
+ {{item.name}}
+
+
+
+
+ 确定
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.wxss b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.wxss
new file mode 100644
index 0000000..dc83b8a
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingStaff/meetingStaff.wxss
@@ -0,0 +1,46 @@
+
+.serviceView {
+ margin-top: 80rpx;
+}
+
+.serviceView .leftLineTitle {
+ margin-left: 20rpx;
+}
+
+.serviceView .serviceItemView {
+ margin-top: 30rpx;
+}
+
+.serviceView .serviceItemView .serviceItem {
+ border-bottom: 1px solid rgb(126, 126, 126, 0.2);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ word-break: break-all;
+ padding: 20rpx 20rpx;
+}
+
+.serviceView .serviceItemView .serviceItem:first-of-type {
+ border-top: 1px solid rgb(126, 126, 126, 0.2);
+}
+
+.serviceView .serviceItem .name {
+ position: relative;
+ flex: 1;
+ margin-right: 20rpx;
+ padding-left: 10rpx;
+ font-size: 26rpx;
+}
+
+.serviceView .serviceItem .content {
+ color: red;
+ font-size: 24rpx;
+ max-width: 400rpx;
+}
+
+.statementView {
+ padding: 80rpx 40rpx;
+ font-size: 24rpx;
+ text-indent: 48rpx;
+ color: gray;
+}
diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.js b/miniprogram/pages/meeting/reservationRecord/approve/approve.js
index 2a12304..fbfdc20 100644
--- a/miniprogram/pages/meeting/reservationRecord/approve/approve.js
+++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.js
@@ -331,10 +331,19 @@ Page({
console.log('jumpMeetingDetail', e);
let id = e.currentTarget.dataset.id
wx.navigateTo({
- url: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail?id=" + id,
+ url: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail?act=approve&id=" + id,
+ })
+ },
+ /**
+ * 跳转会务负责人页面，选择会务负责人
+ * @param {}} e
+ */
+ goStaff(e) {
+ let id = e.currentTarget.dataset.id
+ wx.navigateTo({
+ url: "/pages/meeting/meetingRoom/meetingStaff/meetingStaff?rId=" + id,
})
},
-
// 取消预约一系列方法
cancelConfirm(e) {
console.log('cancelConfirm', e);
@@ -459,7 +468,7 @@ Page({
// on cancel
});
},
- // 取消预约一系列方法
+ // 驳回预约
rejectConfirm(e) {
console.log('rejectConfirm', e);
let _this = this;
diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
index f6f126c..7e639c7 100644
--- a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
@@ -34,6 +34,7 @@
-->
修改信息
+ 会务负责人
通过
驳回
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
index f01e0c1..cdbedd1 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
@@ -67,6 +67,20 @@ Page({
}
return value;
},
+ // 驳回相关参数
+ showRejectReason: false, // 是否展示弹出层
+ rejectlId: '', // 驳回预约会议id
+ rejectReason: '', // 驳回预约原因
+ beforeReject(action) {
+ return new Promise(resolve => {
+ if (action === 'confirm') {
+ resolve(false)
+ } else {
+ resolve(true)
+ }
+ });
+ }, // 弹出层点击确认不关闭，手动关
+ act: '' // 动作
},
/**
@@ -185,6 +199,84 @@ Page({
})
})
},
+ pass() {
+ Dialog.confirm({
+ title: '确认',
+ message: '是否确认通过会议室申请？',
+ })
+ .then(() => {
+ // on confirm
+ console.log('已通过')
+ // 重新加载数据
+ this.getDataList()
+ })
+ .catch(() => {
+ // on cancel
+ });
+ },
+ // 驳回预约
+ rejectConfirm(e) {
+ console.log('rejectConfirm', e);
+ let _this = this;
+ let id = e.currentTarget.dataset.id
+ _this.setData({
+ rejectId: id,
+ showRejectReason: true,
+ rejectReason: ''
+ })
+ },
+ onCloseReject(e) {
+ let _this = this;
+ _this.setData({
+ rejectId: '',
+ showRejectReason: false,
+ rejectReason: ''
+ })
+ },
+ onChangeRejectReason(e) {
+ let _this = this;
+ _this.setData({
+ rejectReason: e.detail
+ })
+ },
+ // 取消订单
+ rejectOrder() {
+ let _this = this;
+ let id = _this.data.rejectId
+ let reason = _this.data.rejectReason
+ if (id === '') {
+ return
+ }
+ if (reason === '') {
+ Notify('请输入驳回原因！')
+ return
+ }
+ // 执行驳回方法
+ console.log('驳回，原因为' + reason)
+ return
+ cancelOrderRq({
+ id: id,
+ cancelResaon: reason
+ }).then(res => {
+ console.log('rejectOrder', res);
+ if (res.code == 0) {
+ // 刷新预约数据
+ _this.setData({
+ reservationPageNum: 1,
+ reservationDataList: [],
+ reservationIsDataAll: false,
+ showRejcctReason: false
+ })
+ _this.getDataList()
+ } else {
+ // 危险通知
+ Notify({
+ type: 'danger',
+ message: res.msg
+ });
+ }
+ })
+ },
// 取消预约一系列方法
cancelConfirm(e) {
console.log('cancelConfirm', e);
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
index 4fd7529..df9cc41 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
@@ -102,8 +102,10 @@
- 取消预约
+ 取消预约
修改信息
+ 通过
+ 驳回
@@ -113,6 +115,11 @@
+
+
+
+
+