Skip to content

S
schedule
Commit e953b9b0 by fengzhaoyu
Options

加上了权限

parent 224a17bf
Showing with 140 additions and 100 deletions
pages/attendingSituation/attendingSituation.acss
...@@ -28,7 +28,7 @@ page { ...@@ -28,7 +28,7 @@ page {
text-align: center; text-align: center;
} }
.headImg image { .headImg image {
vertical-align: middle; vertical-align: top;
width: 64rpx; width: 64rpx;
height: 64rpx; height: 64rpx;
border-radius: 50%; border-radius: 50%;
......
pages/createOrEditSchedule/createOrEditSchedule.acss
...@@ -22,6 +22,7 @@ page { ...@@ -22,6 +22,7 @@ page {
color: #191F25; color: #191F25;
padding: 30rpx 32rpx; padding: 30rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
position: relative;
} }
.theme input { .theme input {
...@@ -81,7 +82,7 @@ page { ...@@ -81,7 +82,7 @@ page {
.startTime { .startTime {
width: 355rpx; width: 355rpx;
text-indent: 32rpx; text-indent: 32rpx;
position: relative; /* position: relative; */
/* border-right: 1rpx solid rgba(25, 31, 37, 0.12); */ /* border-right: 1rpx solid rgba(25, 31, 37, 0.12); */
} }
...@@ -273,16 +274,20 @@ page { ...@@ -273,16 +274,20 @@ page {
} }
.editList { .editList {
padding: 24rpx 16rpx; width: 670rpx;
padding: 0 16rpx;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.13); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.13);
background: #fff; background: #fff;
display: flex; display: flex;
width: 670rpx; width: 670rpx;
border-radius: 6rpx; border-radius: 6rpx;
margin: 24rpx 0 0 24rpx; margin: 24rpx 24rpx 0 24rpx;
justify-content: space-around; justify-content: space-around;
} }
.editList>view {
margin: 24rpx 0;
}
.listIcon { .listIcon {
line-height: 30rpx; line-height: 30rpx;
text-align: center; text-align: center;
...@@ -322,6 +327,7 @@ page { ...@@ -322,6 +327,7 @@ page {
.repeatContaint { .repeatContaint {
width: 100%; width: 100%;
height: auto;
} }
.repeat .iconshanchu { .repeat .iconshanchu {
...@@ -363,4 +369,18 @@ page { ...@@ -363,4 +369,18 @@ page {
.blank>text { .blank>text {
margin-right: 10rpx; 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
{{permissions}}
<view class="createOrEditSchedule"> <view class="createOrEditSchedule">
<!-- 主题 --> <!-- 主题 -->
<view class="theme"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}"/> <view class="theme">
<input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}"/>
</view>
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
</view> </view>
<!-- 时间 --> <!-- 时间 -->
<view class="time"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}" >
<view class="startTime {{timeStaus === '0' ? 'selectTime' : ''}}" data-timeStaus="0" onTap="selectTime"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
<view class="timeContainer"> </view>
<view class="yearTime"> <view class="time">
<view class="startTime {{timeStaus === '0' ? 'selectTime' : ''}}" data-timeStaus="0" onTap="selectTime">
<view class="timeContainer">
<view class="yearTime">
{{time1.slice(5,7)}}月{{time1.slice(8,10)}}日 {{time1.slice(5,7)}}月{{time1.slice(8,10)}}日
</view> </view>
<view class="dayTime"> <view class="dayTime">
{{time1.slice(11,16)}} {{time1.slice(11,16)}}
</view>
</view> </view>
</view> <view class="weekTime">
<view class="weekTime">
{{week1}} {{week1}}
</view>
<!--<view class="line {{!!timeStaus ? 'selectLine' : ''}}"> -->
</view>
<view class="endTime {{timeStaus === '1' ? 'selectTime' : ''}}" data-timeStaus="1" onTap="selectTime">
<view class="timeContainer">
<view class="yearTime">
{{time2.slice(5,7)}}月{{time2.slice(8,10)}}日
</view>
<view class="dayTime">
{{time2.slice(11,16)}}
</view> </view>
<!--<view class="line {{!!timeStaus ? 'selectLine' : ''}}"> -->
</view> </view>
<view class="weekTime"> <view class="endTime {{timeStaus === '1' ? 'selectTime' : ''}}" data-timeStaus="1" onTap="selectTime">
<view class="timeContainer">
<view class="yearTime">
{{time2.slice(5,7)}}月{{time2.slice(8,10)}}日
</view>
<view class="dayTime">
{{time2.slice(11,16)}}
</view>
</view>
<view class="weekTime">
{{week2}} {{week2}}
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 地点 --> <!-- 地点 -->
<view class="place" a:if="{{!!locationName}}"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="icon iconfont icondingwei"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<view class="text" data-nextPage="place" onTap="nextPage"> <view class="place" a:if="{{!!locationName}}">
<view class="selectPlace" a:if="{{!!locationName}}"> <view class="icon iconfont icondingwei">
<text>{{locationName}}</text>
<text class="iconshanchu iconfont" data-icon="icondingwei" catchTap="closeEditList"></text>
</view> </view>
<text a:else> <view class="text" data-nextPage="place" onTap="nextPage">
<view class="selectPlace" a:if="{{!!locationName}}">
<text>{{locationName}}</text>
<text class="iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="icondingwei" catchTap="closeEditList"></text>
</view>
<text a:else>
添加地点 添加地点
</text> </text>
</view>
</view> </view>
</view> </view>
<!-- 参会人 --> <!-- 参会人 -->
...@@ -85,54 +96,64 @@ ...@@ -85,54 +96,64 @@
</view> </view>
</view> </view>
<!-- 提醒 --> <!-- 提醒 -->
<view class="remind" a:if="{{aheadTimes.length}}"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="icon iconfont iconfont iconhuiqiantixing"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<view class="text" data-nextPage="remind" onTap="nextPage"> <view class="remind" a:if="{{aheadTimes.length}}">
<text class="blank"> <view class="icon iconfont iconfont iconhuiqiantixing">
<text a:if="{{aheadTimes.includes(0)}}">立即提醒</text> </view>
<text a:if="{{aheadTimes.includes(5)}}">5分钟前</text> <view class="text" data-nextPage="remind" onTap="nextPage">
<text a:if="{{aheadTimes.includes(15)}}">15分钟前</text> <text class="blank">
<text a:if="{{aheadTimes.includes(30)}}">30分钟前</text> <text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时前</text> <text a:if="{{aheadTimes.includes(5)}}">5分钟前</text>
<text a:if="{{aheadTimes.includes(1440)}}">1天前</text> <text a:if="{{aheadTimes.includes(15)}}">15分钟前</text>
<text a:if="{{aheadTimes.includes(2880)}}">2天前</text> <text a:if="{{aheadTimes.includes(30)}}">30分钟前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text> <text a:if="{{aheadTimes.includes(60)}}">1小时前</text>
<text a:if="{{aheadTimes.includes(1440)}}">1天前</text>
<text a:if="{{aheadTimes.includes(2880)}}">2天前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒 提醒
</text> </text>
<text class="close iconshanchu iconfont" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text> <text class="close iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text>
</view>
</view> </view>
</view> </view>
<!-- 重复 --> <!-- 重复 -->
<view class="repeat" a:if="{{!!scheduleItem&&!!repeatable}}"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="iconfont iconchongfu"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<view class="repeatContaint"> <view class="repeat" a:if="{{!!scheduleItem&&!!repeatable}}">
<view class="repeatTime" data-nextPage="repeatMechanism" onTap="nextPage"> <view class="iconfont iconchongfu">
<text>{{recurrenceModel.model=='day_in_week'?(recurrenceModel.weekDayList.length==1?repeatWeek:'每周的工作日重复'):recurrenceModel.model=='every_day'?'每天重复': '不重复'}}</text>
<view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList">
</view>
</view> </view>
<view class="terminationTime" onTap="selectTerminal" a:if="{{ recurrenceModel.model !== 'no_repeat' }}"> <view class="repeatContaint">
<text a:if="{{recurrenceModel.forever == '1'}}">永不截止</text> <view class="repeatTime" data-nextPage="repeatMechanism" onTap="nextPage">
<text a:else>截止至{{recurrenceModel.terminateTime}}</text> <text>{{recurrenceModel.model=='day_in_week'?(recurrenceModel.weekDayList.length==1?repeatWeek:'每周的工作日重复'):recurrenceModel.model=='every_day'?'每天重复': '不重复'}}</text>
<view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view>
<view class="terminationTime" onTap="selectTerminal" a:if="{{ recurrenceModel.model !== 'no_repeat' }}">
<text a:if="{{recurrenceModel.forever == '1'}}">永不截止</text>
<text a:else>截止至{{recurrenceModel.terminateTime}}</text>
</view>
</view> </view>
</view>. </view>
<!--<view class="repeatTime"><view class="iconfont iconchongfu "></view><view class="repeatText">
每周重复</view><view class="iconfont iconshanchu"></view></view> -->
</view> </view>
<!-- 描述 --> <!-- 描述 -->
<view class="describe" a:if="{{!!remark}}"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="iconfont icondidianmiaoshu"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<view class="describeText" data-nextPage="addRemark" onTap="nextPage"> <view class="describe" a:if="{{!!remark}}">
{{remark}} <view class="iconfont icondidianmiaoshu">
</view> </view>
<view class="iconfont iconshanchu" data-icon="icondidianmiaoshu" catchTap="closeEditList"> <view class="describeText" data-nextPage="addRemark" onTap="nextPage">
{{remark}}
</view>
<view class="iconfont iconshanchu" data-icon="icondidianmiaoshu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view> </view>
</view> </view>
<!-- 编辑列表 --> <!-- 编辑列表 -->
<view class="editList" a:if="{{!!scheduleItem?true:(!locationName|| !aheadTimes.length?true:false)}}"> <view class="editList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
<view a:if="{{!locationName}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei"> <view a:if="{{!locationName}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
<view class="listIcon iconfont icondingwei"> <view class="listIcon iconfont icondingwei">
</view> </view>
...@@ -161,9 +182,6 @@ ...@@ -161,9 +182,6 @@
描述 描述
</view> </view>
</view> </view>
{{organize}}
<!-- {{permissions}} -->
{{organize}}
<view a:if="{{isRepeat==0&&!!scheduleItem}}" class="listGroup" onTap="editSchedule" data-icon="iconshanchu"> <view a:if="{{isRepeat==0&&!!scheduleItem}}" class="listGroup" onTap="editSchedule" data-icon="iconshanchu">
<view class="listIcon iconfont iconshanchu"> <view class="listIcon iconfont iconshanchu">
</view> </view>
...@@ -171,15 +189,17 @@ ...@@ -171,15 +189,17 @@
删除 删除
</view> </view>
</view> </view>
<picker a:if="{{!!scheduleItem&&isRepeat==1}}" range="{{['仅删除此次会议', '删除以后会议', '删除所有会议']}}" onChange="deleteRepeatSchedule"> <view a:if="{{!!scheduleItem&&isRepeat==1}}">
<view class="listGroup" data-icon="iconshanchu"> <picker range="{{['仅删除此次会议', '删除以后会议', '删除所有会议']}}" onChange="deleteRepeatSchedule">
<view class="listIcon iconfont iconshanchu"> <view class="listGroup" data-icon="iconshanchu">
</view> <view class="listIcon iconfont iconshanchu">
<view class="listText"> </view>
<view class="listText">
删除 删除
</view>
</view> </view>
</view> </picker>
</picker> </view>
</view> </view>
<!-- 编辑重复的时候的保存 --> <!-- 编辑重复的时候的保存 -->
<picker a:if="{{isRepeat=='1'}}" value="{{0}}" range="{{['仅更新此会议', '更新以后会议', '更新所有会议']}}" onChange="saveRepeat"> <picker a:if="{{isRepeat=='1'}}" value="{{0}}" range="{{['仅更新此会议', '更新以后会议', '更新所有会议']}}" onChange="saveRepeat">
......
pages/createOrEditSchedule/createOrEditSchedule.js
...@@ -6,8 +6,8 @@ create.Page({ ...@@ -6,8 +6,8 @@ create.Page({
store: exampleStore, store: exampleStore,
useAll: true, useAll: true,
data: { data: {
modifyModel: '', modifyModel: 'only',
deleteModel: '', deleteModel: 'only',
timeStaus: '', timeStaus: '',
isShowModal: false, isShowModal: false,
title: '', title: '',
...@@ -32,6 +32,7 @@ create.Page({ ...@@ -32,6 +32,7 @@ create.Page({
}, },
onLoad(event) { onLoad(event) {
let index = new Date().getDay() let index = new Date().getDay()
let title = `${getApp().globalData.name}创建的会议`
this.data.repeatWeek = this.data.repeatWeek[index - 1] this.data.repeatWeek = this.data.repeatWeek[index - 1]
this.store.data.remark = '' this.store.data.remark = ''
this.store.data.recurrenceModel = { this.store.data.recurrenceModel = {
...@@ -62,7 +63,8 @@ create.Page({ ...@@ -62,7 +63,8 @@ create.Page({
week2: w, week2: w,
type: event.type, type: event.type,
permissions: getApp().globalData.userid, permissions: getApp().globalData.userid,
repeatWeek: this.data.repeatWeek repeatWeek: this.data.repeatWeek,
title:title
}) })
if (!!event.scheduleItem) { if (!!event.scheduleItem) {
let scheduleItem = JSON.parse(event.scheduleItem) let scheduleItem = JSON.parse(event.scheduleItem)
...@@ -400,6 +402,7 @@ create.Page({ ...@@ -400,6 +402,7 @@ create.Page({
week1: this.data.weekList[new Date(res.data.data.startTime.replace(/\//g, "-")).getDay()], 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()] week2: this.data.weekList[new Date(res.data.data.endTime.replace(/\//g, "-")).getDay()]
}) })
console.log(this.data.organizer, 1111111)
this.update() this.update()
this.conflict() this.conflict()
...@@ -494,13 +497,13 @@ create.Page({ ...@@ -494,13 +497,13 @@ create.Page({
saveRepeat(event) { saveRepeat(event) {
let modifyModel = '' let modifyModel = ''
switch (event.detail.value) { switch (event.detail.value) {
case 0: case '0':
modifyModel = 'only' modifyModel = 'only'
break; break;
case 1: case '1':
modifyModel = 'future' modifyModel = 'future'
break; break;
case 2: case '2':
modifyModel = 'all' modifyModel = 'all'
break; break;
} }
...@@ -512,22 +515,21 @@ create.Page({ ...@@ -512,22 +515,21 @@ create.Page({
// 删除重复日程 // 删除重复日程
deleteRepeatSchedule(event) { deleteRepeatSchedule(event) {
let deleteModel = '' let deleteModel = ''
console.log(event.detail.value)
switch (event.detail.value) { switch (event.detail.value) {
case 0 || '0': case '0':
deleteModel = 'only' deleteModel = 'only';
break; break;
case 1 || '1': case '1':
deleteModel = 'future' deleteModel = 'future';
break; break;
case 2 || '2': case '2':
deleteModel = 'all' deleteModel = 'all';
break; break;
} }
this.setData({ this.setData({
deleteModel: deleteModel deleteModel: deleteModel
}) })
console.log(11111)
console.log(JSON.stringify(this.data.scheduleItem.planDate))
let data = { let data = {
planDate: this.data.scheduleItem.planDate, planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId, templateId: this.data.scheduleItem.scheduleTemplateId,
...@@ -539,7 +541,6 @@ create.Page({ ...@@ -539,7 +541,6 @@ create.Page({
delta: 2 delta: 2
}) })
}) })
}, },
// 已选用户去中去掉必选用户 // 已选用户去中去掉必选用户
selectedelRequired(req, pic) { selectedelRequired(req, pic) {
......
pages/participantsDetail/participantsDetail.axml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</view> </view>
<view class="info"> <view class="info">
<text class="name">{{item.username}}</text> <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> </view>
<view class="button"> <view class="button">
......
pages/participantsDetail/participantsDetail.js
...@@ -10,11 +10,11 @@ create.Page({ ...@@ -10,11 +10,11 @@ create.Page({
scheduleItem: '', scheduleItem: '',
requireUsers: [], requireUsers: [],
organizer: '', organizer: '',
myself: '', permissions: '',
requireUsersInfo: [] requireUsersInfo: []
}, },
onLoad(event) { onLoad(event) {
let myself = getApp().globalData.userid let permissions = getApp().globalData.userid
let scheduleItem = JSON.parse(event.scheduleItem) let scheduleItem = JSON.parse(event.scheduleItem)
let organizer = event.organizer let organizer = event.organizer
let requireUsers = JSON.parse(event.requireUsers) let requireUsers = JSON.parse(event.requireUsers)
...@@ -25,7 +25,7 @@ create.Page({ ...@@ -25,7 +25,7 @@ create.Page({
scheduleItem: scheduleItem, scheduleItem: scheduleItem,
time1: scheduleItem.startTime, time1: scheduleItem.startTime,
time2: scheduleItem.endTime, time2: scheduleItem.endTime,
myself: myself, permissions: permissions,
requireUsersInfo: requireUsersInfo requireUsersInfo: requireUsersInfo
}) })
dd.setNavigationBar({ dd.setNavigationBar({
......
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