diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js
index 865ae8e..04a193f 100644
--- a/miniprogram/api/meeting/meetingRoom.js
+++ b/miniprogram/api/meeting/meetingRoom.js
@@ -234,3 +234,11 @@ export function getDep() {
method: "post",
})
}
+
+export function approveOrderDel(data) {
+ return request({
+ url: '/app/mr/delete',
+ method: "post",
+ data,
+ });
+}
diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml
index d42381b..95e3c3b 100644
--- a/miniprogram/pages/index/index.wxml
+++ b/miniprogram/pages/index/index.wxml
@@ -8,7 +8,7 @@
欢迎进入
- 市行政中心后勤服务平台
+ 淮安市行政中心智慧后勤服务平台
diff --git a/miniprogram/pages/meeting/index/index.js b/miniprogram/pages/meeting/index/index.js
index 9256d61..8d9790d 100644
--- a/miniprogram/pages/meeting/index/index.js
+++ b/miniprogram/pages/meeting/index/index.js
@@ -1,6 +1,7 @@
const app = getApp()
import Notify from '@vant/weapp/notify/notify';
+import Dialog from '@vant/weapp/dialog/dialog';
import {
depLogin
} from "../../../api/login/login.js"
@@ -67,6 +68,7 @@ Page({
}
})
}, // 弹出层点击确认不关闭,手动关
+ adminTel: '83605343',
},
showTimePicker() {
this.setData({
@@ -82,6 +84,22 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ Dialog.alert({
+ message: '1、此系统分配的账号仅用于会议室申请预约,请各单位专人扎口负责会议预定管理工作。\n2、系统提示“预约提交成功”后请及时关注预约进度,若有疑问请随时拨打会议服务热线:83605343。\n3、会议开始前如需调整会议,请及时通过系统操作或电话告知,已预约成功的会议室可能因临时重大会议取消或调剂,请理解配合。',
+ messageAlign: 'left',
+ }).then(() => {
+ // on close
+ })
+ let count = 5
+ const countdown = setInterval(() => {
+ if (count > 0) {
+ count--;
+ } else {
+ Dialog.close()
+ clearInterval(countdown);
+ }
+ }, 1000)
+
let _this = this
let userDetail = wx.getStorageSync('user')
// 获取两周后时间,默认只能选两周之后,管理员可以选一年后的
@@ -97,7 +115,7 @@ Page({
key: 'DEP_USERNAME',
success(res) {
_this.setData({
- username: res.data
+ username: res.data
})
},
})
@@ -105,7 +123,7 @@ Page({
key: 'DEP_PWD',
success(res) {
_this.setData({
- pwd: res.data
+ pwd: res.data
})
},
})
@@ -279,6 +297,12 @@ Page({
})
},
+ callAdmin() {
+ let num = this.data.adminTel
+ wx.makePhoneCall({
+ phoneNumber: num
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pages/meeting/index/index.wxml b/miniprogram/pages/meeting/index/index.wxml
index 39e367f..14d0691 100644
--- a/miniprogram/pages/meeting/index/index.wxml
+++ b/miniprogram/pages/meeting/index/index.wxml
@@ -24,6 +24,11 @@
+
+
+ 会议服务热线: {{ adminTel }}
+
+
@@ -35,6 +40,7 @@
+
diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.js b/miniprogram/pages/meeting/reservationRecord/approve/approve.js
index c2ae97a..8e727e3 100644
--- a/miniprogram/pages/meeting/reservationRecord/approve/approve.js
+++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.js
@@ -12,7 +12,8 @@ import {
selectReservationListByUserIdRq,
selectVisitorInvitationRecordRq,
cancelOrderRq,
- approveOrderRq
+ approveOrderRq,
+ approveOrderDel
} from "../../../../api/meeting/meetingRoom.js"
Page({
@@ -339,7 +340,7 @@ Page({
if (statusValue == 4) {
// 占用,可以修改
showEdit = true
- // showCancel = true
+ showCancel = true
// showStaff = true
statusName = '已占用'
}
@@ -410,13 +411,54 @@ Page({
// 取消预约一系列方法
cancelConfirm(e) {
console.log('cancelConfirm', e);
+ let status = e.currentTarget.dataset.status
let _this = this;
let id = e.currentTarget.dataset.id
- _this.setData({
- cancelId: id,
- showCancelReason: true,
- cancelReason: ''
- })
+ if (status == '4') {
+ // 占用,占用的取消直接删除
+ Dialog.confirm({
+ title: '确认',
+ message: '取消后不可撤销,是否确认?',
+ })
+ .then(() => {
+ // on confirm
+ approveOrderDel({
+ id: id,
+ }).then(res => {
+ console.log('delApprove', res)
+ if (res.code == 0) {
+ // 刷新预约数据
+ _this.setData({
+ reservationPageNum: 1,
+ reservationDataList: [],
+ reservationIsDataAll: false,
+ showRejectReason: false
+ })
+ Notify({
+ type: 'success',
+ message: '已取消'
+ })
+ _this.getDataList()
+ } else {
+ // 危险通知
+ Notify({
+ type: 'danger',
+ message: res.msg
+ });
+ }
+ })
+ })
+ .catch(() => {
+ // on cancel
+ });
+ } else {
+ // 其余的取消,需要输入原因
+ _this.setData({
+ cancelId: id,
+ showCancelReason: true,
+ cancelReason: ''
+ })
+ }
},
onCloseCancel(e) {
let _this = this;
diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
index bc9819e..719e8de 100644
--- a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
@@ -34,7 +34,7 @@
- 取消预约
+ 取消预约
修改信息
会务负责人
通过
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
index c0d6039..b1ff0e0 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
@@ -14,7 +14,8 @@ import {
cancelOrderRq,
inviteRecordPersonListRq,
getMeetingRoomServiceAndEquipmentRq,
- approveOrderRq
+ approveOrderRq,
+ approveOrderDel
} from "../../../../../api/meeting/meetingRoom.js"
Page({
@@ -152,6 +153,7 @@ Page({
if (act == 'approve') {
// 管理员允许编辑
showEdit = true
+ showCancel = true
}
statusName = '已占用'
}
@@ -378,12 +380,53 @@ Page({
cancelConfirm(e) {
console.log('cancelConfirm', e);
let _this = this;
+ let status = e.currentTarget.dataset.status
let id = e.currentTarget.dataset.id
- _this.setData({
- cancelId: id,
- showCancelReason: true,
- cancelReason: ''
- })
+ if (status == '4') {
+ // 占用,占用的取消直接删除
+ Dialog.confirm({
+ title: '确认',
+ message: '取消后不可撤销,是否确认?',
+ })
+ .then(() => {
+ // on confirm
+ approveOrderDel({
+ id: id,
+ }).then(res => {
+ console.log('delApprove', res)
+ if (res.code == 0) {
+ Notify({
+ type: 'success',
+ message: '已取消'
+ })
+ // 数据状态变更,向上个页面传递变更
+ let pages = getCurrentPages(); //获取page
+ let prevPage = pages[pages.length - 2]; //上一个页面(父页面)
+ prevPage.setData({
+ dataChange: true
+ })
+ wx.navigateBack({
+ delta: 1 // 返回的页面数,如果 delta 大于现有页面数,则返回到首页。
+ })
+ } else {
+ // 危险通知
+ Notify({
+ type: 'danger',
+ message: res.msg
+ });
+ }
+ })
+ })
+ .catch(() => {
+ // on cancel
+ });
+ } else {
+ _this.setData({
+ cancelId: id,
+ showCancelReason: true,
+ cancelReason: ''
+ })
+ }
},
onCloseCancel(e) {
let _this = this;
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
index 317b957..9475435 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
@@ -105,7 +105,7 @@
- 取消预约
+ 取消预约
修改信息
通过
驳回