Commit 64d69216 by fengzhaoyu

fix: 修改会议室时间没有保存 注释绑定第三方入口 会议室占用状态实时更新

parent 8e00948c
......@@ -156,7 +156,12 @@ create.Page({
}
break;
case 'modify_location':
if ((this.$store.data.locationName !== this.$store.data.originalData.locationName) || (this.$store.data.roomId !== this.$store.data.originalData.meetingRoomId)) {
if (
(this.$store.data.locationName !== this.$store.data.originalData.locationName)
|| (this.$store.data.roomId !== this.$store.data.originalData.meetingRoomId)
|| (this.$store.data.startTime != this.$store.data.originalData.startTime)
|| (this.$store.data.endTime != this.$store.data.originalData.endTime)
) {
if (this.data.repeatable === 1) {
this.setData({
'conSelectPopupData.selectType': 'common',
......@@ -678,6 +683,13 @@ create.Page({
this.$store.modifyErpeatMeeting()
}
}
if (data.modifyContent == 'modify_time' || data.modifyContent == ' modify_location') {
this.setData({
mrReserveStatus: res.data.extra
})
this.$store.data.originalData.mrReserveStatus = res.data.extra
this.update()
}
if (this.$store.data.originalData.repeatable === 1 && !!res.data.data) {
observer.notice(res.data.data)
......
......@@ -47,12 +47,7 @@
<view a:if="{{!loading}}">
<view class="scheduleHeader">
<view>{{currentData.split('/')[0]}}年{{currentData.split('/')[1] || '1'}}月</view>
<view onTap="changesidebar" class="headerIcon">
<text class="iconfont iconicon_app1">
</text>
<view>
</view>
</view>
<!--<view onTap="changesidebar" class="headerIcon"><text class="iconfont iconicon_app1"></text><view></view></view> -->
</view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" onScroll="scroll" lower-threshold="{{400}}" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" key="{{item.dateStr}}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment