Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
64d69216
Commit
64d69216
authored
May 18, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改会议室时间没有保存 注释绑定第三方入口 会议室占用状态实时更新
parent
8e00948c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+13
-1
scheduleList.axml
pages/scheduleList/scheduleList.axml
+1
-6
No files found.
pages/meetingDetail/meetingDetail.js
View file @
64d69216
...
@@ -156,7 +156,12 @@ create.Page({
...
@@ -156,7 +156,12 @@ create.Page({
}
}
break
;
break
;
case
'modify_location'
:
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
)
{
if
(
this
.
data
.
repeatable
===
1
)
{
this
.
setData
({
this
.
setData
({
'conSelectPopupData.selectType'
:
'common'
,
'conSelectPopupData.selectType'
:
'common'
,
...
@@ -678,6 +683,13 @@ create.Page({
...
@@ -678,6 +683,13 @@ create.Page({
this
.
$store
.
modifyErpeatMeeting
()
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
)
{
if
(
this
.
$store
.
data
.
originalData
.
repeatable
===
1
&&
!!
res
.
data
.
data
)
{
observer
.
notice
(
res
.
data
.
data
)
observer
.
notice
(
res
.
data
.
data
)
...
...
pages/scheduleList/scheduleList.axml
View file @
64d69216
...
@@ -47,12 +47,7 @@
...
@@ -47,12 +47,7 @@
<view a:if="{{!loading}}">
<view a:if="{{!loading}}">
<view class="scheduleHeader">
<view class="scheduleHeader">
<view>{{currentData.split('/')[0]}}年{{currentData.split('/')[1] || '1'}}月</view>
<view>{{currentData.split('/')[0]}}年{{currentData.split('/')[1] || '1'}}月</view>
<view onTap="changesidebar" class="headerIcon">
<!--<view onTap="changesidebar" class="headerIcon"><text class="iconfont iconicon_app1"></text><view></view></view> -->
<text class="iconfont iconicon_app1">
</text>
<view>
</view>
</view>
</view>
</view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" onScroll="scroll" lower-threshold="{{400}}" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<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}}">
<block a:for="{{scheduleList}}" key="{{item.dateStr}}">
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment