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
a47abc9e
Commit
a47abc9e
authored
5 years ago
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复从动态页进去修改单次会议动态找不到shecduleIndex
parent
7929a68b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
21 deletions
+25
-21
index.axml
pages/index/index.axml
+1
-1
index.js
pages/index/index.js
+12
-15
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+12
-5
No files found.
pages/index/index.axml
View file @
a47abc9e
...
...
@@ -86,7 +86,7 @@
</view>
<view>{{item.hasDateLabel}}</view>
</view>
<view class="scheduleBox {{item.value.isBeOverdue ? 'overdue' : item.value.confirmAttendance === 0 ? 'cancel' : ''}}" data-item="{{item.value}}"
data-index="{{index}}"
onTap="nextDetail">
<view class="scheduleBox {{item.value.isBeOverdue ? 'overdue' : item.value.confirmAttendance === 0 ? 'cancel' : ''}}" data-item="{{item.value}}" onTap="nextDetail">
<view class="scheduleTitle">
<text>{{item.value.title}}{{item.value.isDaySpan ? `(第${item.value.isFewDays}天,共${item.value.duration}天)` : '' }}</text>
</view>
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.js
View file @
a47abc9e
...
...
@@ -130,18 +130,20 @@ create.Page({
//修改会议,除单次会议修改成重复会议
async
modifyOnceMeetingContent
(
content
)
{
await
this
.
getData
(
true
);
const
scheduleListIndex
=
`scheduleList[
${
this
.
data
.
scheduleListIndex
}
].value`
;
const
item
=
this
.
data
.
scheduleList
[
this
.
data
.
scheduleListIndex
].
value
this
.
setData
({
[
scheduleListIndex
]:
{
...
item
,
...
content
//修改数据源
for
(
let
i
=
0
;
i
<
this
.
data
.
scheduleList
.
length
;
i
++
)
{
if
(
typeof
this
.
data
.
scheduleList
[
i
].
value
!==
'string'
)
{
if
(
this
.
data
.
scheduleList
[
i
].
value
.
id
===
content
.
id
)
{
this
.
setData
({
[
`scheduleList[
${
i
}
].value`
]:
{
...
this
.
data
.
scheduleList
[
i
].
value
,
...
content
}
})
break
;
}
}
});
}
for
(
let
i
=
0
;
i
<
this
.
scheduleList
.
length
;
i
++
)
{
if
(
typeof
this
.
scheduleList
[
i
].
value
!==
'string'
)
{
if
(
this
.
scheduleList
[
i
].
value
.
id
===
item
.
id
)
{
if
(
this
.
scheduleList
[
i
].
value
.
id
===
content
.
id
)
{
this
.
scheduleList
[
i
].
value
=
{
...
this
.
scheduleList
[
i
].
value
,
...
content
};
break
;
}
...
...
@@ -794,12 +796,7 @@ create.Page({
dd
.
navigateTo
({
url
:
"./../createMeeting/createMeeting"
});
},
nextDetail
:
throttle
(
function
(
e
)
{
const
{
item
,
index
}
=
e
.
target
.
dataset
;
if
(
index
)
{
this
.
setData
({
scheduleListIndex
:
index
})
}
const
{
item
}
=
e
.
target
.
dataset
;
dd
.
navigateTo
({
url
:
`./../meetingDetail/meetingDetail?scheduleItem=
${
encodeURIComponent
(
JSON
.
stringify
(
item
)
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.js
View file @
a47abc9e
...
...
@@ -758,7 +758,7 @@ create.Page({
this
.
conflictPeople
()
if
(
data1
.
type
===
'only'
)
{
if
(
this
.
$store
.
modifyOnceMeetingContent
)
{
this
.
$store
.
modifyOnceMeetingContent
({
confirmAttendance
:
0
})
this
.
$store
.
modifyOnceMeetingContent
({
id
:
this
.
data
.
scheduleItem
.
id
,
confirmAttendance
:
0
})
}
}
else
{
if
(
this
.
$store
.
modifyErpeatMeeting
)
{
...
...
@@ -786,7 +786,7 @@ create.Page({
this
.
conflictPeople
()
if
(
data
.
type
===
'only'
)
{
if
(
this
.
$store
.
modifyOnceMeetingContent
)
{
this
.
$store
.
modifyOnceMeetingContent
({
confirmAttendance
:
1
})
this
.
$store
.
modifyOnceMeetingContent
({
id
:
this
.
data
.
scheduleItem
.
id
,
confirmAttendance
:
1
})
}
}
else
{
if
(
this
.
$store
.
modifyErpeatMeeting
)
{
...
...
@@ -804,6 +804,9 @@ create.Page({
cancelButtonText
:
'取消'
,
success
:
(
success
)
=>
{
if
(
!!
success
.
confirm
)
{
dd
.
showLoading
({
content
:
'正在删除...'
,
});
let
data
=
{
scheduleId
:
this
.
data
.
scheduleItem
.
id
,
identify
:
this
.
data
.
organizer
===
getApp
().
globalData
.
userid
?
'major'
:
'identify'
,
...
...
@@ -929,6 +932,7 @@ create.Page({
if
(
this
.
data
.
repeatable
==
0
)
{
if
(
this
.
$store
.
modifyOnceMeetingContent
)
{
this
.
$store
.
modifyOnceMeetingContent
({
id
:
this
.
data
.
scheduleItem
.
id
,
title
:
this
.
data
.
title
})
}
...
...
@@ -1241,6 +1245,9 @@ create.Page({
cancelButtonText
:
'取消'
,
success
:
(
success
)
=>
{
if
(
!!
success
.
confirm
)
{
dd
.
showLoading
({
content
:
'正在删除...'
,
});
let
data
=
{
scheduleId
:
this
.
data
.
scheduleItem
.
id
,
identify
:
this
.
data
.
organizer
===
getApp
().
globalData
.
userid
?
'major'
:
'identify'
,
...
...
@@ -1284,7 +1291,7 @@ create.Page({
})
this
.
conflictPeople
()
if
(
this
.
$store
.
modifyOnceMeetingContent
)
{
this
.
$store
.
modifyOnceMeetingContent
({
confirmAttendance
:
1
})
this
.
$store
.
modifyOnceMeetingContent
({
id
:
this
.
data
.
scheduleItem
.
id
,
confirmAttendance
:
1
})
}
}
})
...
...
@@ -1310,7 +1317,7 @@ create.Page({
})
this
.
conflictPeople
()
if
(
this
.
$store
.
modifyOnceMeetingContent
)
{
this
.
$store
.
modifyOnceMeetingContent
({
confirmAttendance
:
0
})
this
.
$store
.
modifyOnceMeetingContent
({
id
:
this
.
data
.
scheduleItem
.
id
,
confirmAttendance
:
0
})
}
}
})
...
...
@@ -1342,7 +1349,7 @@ create.Page({
}
}
else
{
if
(
this
.
$store
.
modifyOnceMeetingContent
)
{
this
.
$store
.
modifyOnceMeetingContent
({
confirmAttendance
:
-
9
})
this
.
$store
.
modifyOnceMeetingContent
({
id
:
this
.
data
.
scheduleItem
.
id
,
confirmAttendance
:
-
9
})
}
}
...
...
This diff is collapsed.
Click to expand it.
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