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
e953b9b0
Commit
e953b9b0
authored
Feb 21, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加上了权限
parent
224a17bf
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
25 deletions
+45
-25
attendingSituation.acss
pages/attendingSituation/attendingSituation.acss
+1
-1
createOrEditSchedule.acss
pages/createOrEditSchedule/createOrEditSchedule.acss
+24
-5
createOrEditSchedule.axml
pages/createOrEditSchedule/createOrEditSchedule.axml
+0
-0
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+16
-15
participantsDetail.axml
pages/participantsDetail/participantsDetail.axml
+1
-1
participantsDetail.js
pages/participantsDetail/participantsDetail.js
+3
-3
No files found.
pages/attendingSituation/attendingSituation.acss
View file @
e953b9b0
...
...
@@ -28,7 +28,7 @@ page {
text-align: center;
}
.headImg image {
vertical-align:
middle
;
vertical-align:
top
;
width: 64rpx;
height: 64rpx;
border-radius: 50%;
...
...
pages/createOrEditSchedule/createOrEditSchedule.acss
View file @
e953b9b0
...
...
@@ -22,6 +22,7 @@ page {
color: #191F25;
padding: 30rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
position: relative;
}
.theme input {
...
...
@@ -81,7 +82,7 @@ page {
.startTime {
width: 355rpx;
text-indent: 32rpx;
position: relative;
/* position: relative; */
/* border-right: 1rpx solid rgba(25, 31, 37, 0.12); */
}
...
...
@@ -273,16 +274,20 @@ page {
}
.editList {
padding: 24rpx 16rpx;
width: 670rpx;
padding: 0 16rpx;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.13);
background: #fff;
display: flex;
width: 670rpx;
border-radius: 6rpx;
margin: 24rpx
0
0 24rpx;
margin: 24rpx
24rpx
0 24rpx;
justify-content: space-around;
}
.editList>view {
margin: 24rpx 0;
}
.listIcon {
line-height: 30rpx;
text-align: center;
...
...
@@ -322,6 +327,7 @@ page {
.repeatContaint {
width: 100%;
height: auto;
}
.repeat .iconshanchu {
...
...
@@ -363,4 +369,18 @@ page {
.blank>text {
margin-right: 10rpx;
}
\ No newline at end of file
}
.container {
position: relative;
}
.permissions {
width: 100%;
background:rgba(0, 0, 0, 0);
position: absolute;
height: 100%;
top: 0;
z-index: 10;
}
.noPermissions {
opacity: 0.6;
}
pages/createOrEditSchedule/createOrEditSchedule.axml
View file @
e953b9b0
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
e953b9b0
...
...
@@ -6,8 +6,8 @@ create.Page({
store
:
exampleStore
,
useAll
:
true
,
data
:
{
modifyModel
:
''
,
deleteModel
:
''
,
modifyModel
:
'
only
'
,
deleteModel
:
'
only
'
,
timeStaus
:
''
,
isShowModal
:
false
,
title
:
''
,
...
...
@@ -32,6 +32,7 @@ create.Page({
},
onLoad
(
event
)
{
let
index
=
new
Date
().
getDay
()
let
title
=
`
${
getApp
().
globalData
.
name
}
创建的会议`
this
.
data
.
repeatWeek
=
this
.
data
.
repeatWeek
[
index
-
1
]
this
.
store
.
data
.
remark
=
''
this
.
store
.
data
.
recurrenceModel
=
{
...
...
@@ -62,7 +63,8 @@ create.Page({
week2
:
w
,
type
:
event
.
type
,
permissions
:
getApp
().
globalData
.
userid
,
repeatWeek
:
this
.
data
.
repeatWeek
repeatWeek
:
this
.
data
.
repeatWeek
,
title
:
title
})
if
(
!!
event
.
scheduleItem
)
{
let
scheduleItem
=
JSON
.
parse
(
event
.
scheduleItem
)
...
...
@@ -400,6 +402,7 @@ create.Page({
week1
:
this
.
data
.
weekList
[
new
Date
(
res
.
data
.
data
.
startTime
.
replace
(
/
\/
/g
,
"-"
)).
getDay
()],
week2
:
this
.
data
.
weekList
[
new
Date
(
res
.
data
.
data
.
endTime
.
replace
(
/
\/
/g
,
"-"
)).
getDay
()]
})
console
.
log
(
this
.
data
.
organizer
,
1111111
)
this
.
update
()
this
.
conflict
()
...
...
@@ -494,13 +497,13 @@ create.Page({
saveRepeat
(
event
)
{
let
modifyModel
=
''
switch
(
event
.
detail
.
value
)
{
case
0
:
case
'0'
:
modifyModel
=
'only'
break
;
case
1
:
case
'1'
:
modifyModel
=
'future'
break
;
case
2
:
case
'2'
:
modifyModel
=
'all'
break
;
}
...
...
@@ -512,22 +515,21 @@ create.Page({
// 删除重复日程
deleteRepeatSchedule
(
event
)
{
let
deleteModel
=
''
console
.
log
(
event
.
detail
.
value
)
switch
(
event
.
detail
.
value
)
{
case
0
||
'0'
:
deleteModel
=
'only'
case
'0'
:
deleteModel
=
'only'
;
break
;
case
1
||
'1'
:
deleteModel
=
'future'
case
'1'
:
deleteModel
=
'future'
;
break
;
case
2
||
'2'
:
deleteModel
=
'all'
case
'2'
:
deleteModel
=
'all'
;
break
;
}
this
.
setData
({
deleteModel
:
deleteModel
})
console
.
log
(
11111
)
console
.
log
(
JSON
.
stringify
(
this
.
data
.
scheduleItem
.
planDate
))
let
data
=
{
planDate
:
this
.
data
.
scheduleItem
.
planDate
,
templateId
:
this
.
data
.
scheduleItem
.
scheduleTemplateId
,
...
...
@@ -539,7 +541,6 @@ create.Page({
delta
:
2
})
})
},
// 已选用户去中去掉必选用户
selectedelRequired
(
req
,
pic
)
{
...
...
pages/participantsDetail/participantsDetail.axml
View file @
e953b9b0
...
...
@@ -7,7 +7,7 @@
</view>
<view class="info">
<text class="name">{{item.username}}</text>
<text class="close iconshanchu iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
<text class="close iconshanchu iconfont"
a:if="{{!!scheduleItem?(organizer == permissions?(permissions!=item.userId):(permissions!=item.userId&&!requireUsers.includes(item.userId))):(permissions!=item.userId)}}"
data-userId="{{item.userId}}" onTap="delParticipants"></text>
</view>
</view>
<view class="button">
...
...
pages/participantsDetail/participantsDetail.js
View file @
e953b9b0
...
...
@@ -10,11 +10,11 @@ create.Page({
scheduleItem
:
''
,
requireUsers
:
[],
organizer
:
''
,
myself
:
''
,
permissions
:
''
,
requireUsersInfo
:
[]
},
onLoad
(
event
)
{
let
myself
=
getApp
().
globalData
.
userid
let
permissions
=
getApp
().
globalData
.
userid
let
scheduleItem
=
JSON
.
parse
(
event
.
scheduleItem
)
let
organizer
=
event
.
organizer
let
requireUsers
=
JSON
.
parse
(
event
.
requireUsers
)
...
...
@@ -25,7 +25,7 @@ create.Page({
scheduleItem
:
scheduleItem
,
time1
:
scheduleItem
.
startTime
,
time2
:
scheduleItem
.
endTime
,
myself
:
myself
,
permissions
:
permissions
,
requireUsersInfo
:
requireUsersInfo
})
dd
.
setNavigationBar
({
...
...
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