Skip to content

S
schedule
Commit 666fb6f7 by fengzhaoyu
Options

参加不参加

parent b10426fa
Showing with 109 additions and 29 deletions
pages/attendingSituation/attendingSituation.axml
......@@ -3,7 +3,7 @@
<view class="headImg">
<image mode="scaleToFill" src="{{item.participator.headUrl}}" a:if="{{item.participator.headUrl.length}}"/>
<text a:else>{{item.participator.username.substring(0,1)}}</text>
<text a:if="{{item.confirmAttendance!=null}}" class="participatorStaus {{item.confirmAttendance==0 || item.participator.userId == organizer?'accept':'cancel'}} " ></text>
<text a:if="{{item.confirmAttendance!=null}}" class="participatorStaus {{item.confirmAttendance==1 || item.participator.userId == organizer?'accept':'cancel'}} " ></text>
</view>
<view class="info">
<text class="name">{{item.participator.username}}</text>
......
pages/createOrEditSchedule/createOrEditSchedule.js
......@@ -229,12 +229,12 @@ create.Page({
_that.store.data.participatorUserId.push(item.userId)
})
} else {
_that.store.data.participatorList = []
_that.store.data.participatorUserId = []
_that.data.requireUsersInfo.forEach((item, index) => {
_that.store.data.participatorList.push({ userId: item.userId, username: item.username, headUrl: item.headUrl })
_that.store.data.participatorUserId.push(item.userId)
})
_that.store.data.participatorList = []
_that.store.data.participatorUserId = []
res.users.forEach((item, index) => {
_that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.avatar })
_that.store.data.participatorUserId.push(item.userId)
......
pages/index/index.axml
<!-- <mw-select></mw-select> -->
版本号：109版
版本号：112版
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}">
......@@ -47,5 +47,4 @@
</block>
</scroll-view>
<view class="createSchedule iconfont iconjiahao " onTap="nextPage">
</view>
pages/remind/remind.acss
......@@ -40,7 +40,7 @@ page {
border: 1prx solid rgba(25, 31, 37, 0.12);
border-radius: 48rpx;
}
.iconxuanzhong {
.iconxuanzhong1 {
color: #fff;
}
.select {
......
pages/remind/remind.axml
......@@ -4,7 +4,7 @@
<view class="remindText">
{{item.text}}
</view>
<view class="iconfont iconxuanzhong {{aheadTimes.includes(item.time)?'select':''}}">
<view class="iconfont iconxuanzhong1 {{aheadTimes.includes(item.time)?'select':''}}">
</view>
</view>
</view>
......
pages/scheduleDetail/scheduleDetail.acss
......@@ -391,4 +391,16 @@ page {
.line {
color: rgba(25, 31, 37, 0.12)!important;
margin-right: 32rpx;
}
.iconcanjia2 {
color: #15BC83;
}
.iconbucanjia2 {
color: #E60012;
}
.red {
color: #E60012;
}
.green {
color: #15BC83;
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.axml
......@@ -51,7 +51,7 @@
<text>
<image a:if="{{!!item.participator.headUrl}}" mode="scaleToFill" src="{{item.participator.headUrl}}"/>
<text a:else class="name">{{item.participator.username.substring(item.participator.username.length - 2, item.participator.username.length)}}</text>
<text a:if="{{item.confirmAttendance!=null}}"class="participatorStaus {{item.confirmAttendance==0 || item.participator.userId == organizer?'accept':'cancel'}} "></text></text></text></view>
<text a:if="{{item.confirmAttendance!=null}}"class="participatorStaus {{item.confirmAttendance==1 || item.participator.userId == organizer?'accept':'cancel'}} "></text></text></text></view>
<view class="right">
<text class="number">{{userList.length}}人参与</text>
<text class="iconyoujinru iconfont"></text></view></view>
......@@ -125,27 +125,31 @@
</view>
<!-- 底部按钮 -->
<view class="bottom">
<view class="buttonGroup" data-value=0 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<text class="iconcanjia3 iconfont"></text>
<text>参加</text>
<view class="buttonGroup" data-value=1 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<text class="iconcanjia2 iconfont" a:if="{{currentParStaus == 1}}"></text>
<text class="iconcanjia3 iconfont" a:else ></text>
<text class="{{currentParStaus == 1?'green': ''}}">参加</text>
</view>
<picker range="{{['仅参加本次', '参加所有']}}" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}" data-value=0 onTap="confirmRepeatAtten">
<picker range="{{['仅参加本次', '参加所有']}}" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}" data-value=1 onChange="confirmRepeatAtten">
<view>
<view class="buttonGroup">
<text class="iconcanjia3 iconfont"></text>
<text>参加</text>
<text class="iconcanjia2 iconfont" a:if="{{currentParStaus == 1}}"></text>
<text class="iconcanjia3 iconfont" a:else></text>
<text class="{{currentParStaus == 1?'green': ''}}">参加</text>
</view>
</view>
</picker>
<view class="buttonGroup" data-value=1 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<text class="iconbucanjia3 iconfont"></text>
<text>不参加</text>
<view class="buttonGroup" data-value=0 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}" ></text>
<text class="iconbucanjia3 iconfont" a:else></text>
<text class="{{currentParStaus == 0?'red': ''}}">不参加</text>
</view>
<picker range="{{['仅不参加本次', '不参加所有']}}" data-value=1 onTap="confirmRepeatAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}">
<picker range="{{['仅不参加本次', '不参加所有']}}" data-value=0 onChange="cancelRepeatAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}">
<view>
<view class="buttonGroup">
<text class="iconbutanjia3 iconfont"></text>
<text>不参加</text>
<text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}"></text>
<text class="iconbucanjia3 iconfont" a:else></text>
<text class="{{currentParStaus == 0?'red': ''}}">不参加</text>
</view>
</view>
</picker>
......
pages/scheduleDetail/scheduleDetail.js
......@@ -24,7 +24,8 @@ create.Page({
pemissions: '',
isRepeatable: '',
recModel: '',
showPage: false
showPage: false,
currentParStaus: ''
},
onLoad(event) {
let scheduleItem = JSON.parse(event.scheduleItem)
......@@ -43,6 +44,13 @@ create.Page({
templateId: this.data.scheduleItem.scheduleTemplateId
}
getScheduleDetail(data).then(res => {
res.data.data.userList.forEach((item, index) => {
if (item.participator.userId == getApp().globalData.userid) {
this.setData({
currentParStaus: item.confirmAttendance
})
}
})
this.setData({
title: res.data.data.title,
isRepeatable: res.data.data.repeatable,
......@@ -145,6 +153,9 @@ create.Page({
meetingLogId: ''
})
let data = event.target.dataset.file.id
console.log(111111)
console.log(event.target.dataset.file.id)
console.log(22222222)
dd.confirm({
title: '温馨提示',
content: '确认删除本次上传文件吗',
......@@ -154,6 +165,7 @@ create.Page({
if (!!success.confirm) {
if (!!this.data.scheduleItem.id) {
delFile(data).then(res => {
console.log(JSON.stringify(res))
_that.showFile(this.data.scheduleItem.id)
})
} else {
......@@ -242,7 +254,6 @@ create.Page({
timeResule = creatTime.substring(0, 16)
}
return timeResule
},
// 确认参加不参加 单次的会议
confirmAtten(event) {
......@@ -261,32 +272,85 @@ create.Page({
}
isParticipate(data).then(res => {
getScheduleDetail(data1).then(success => {
this.store.data.userList = res.data.data.userList
this.store.data.userList = success.data.data.userList
this.update()
success.data.data.userList.forEach((item, index) => {
if (item.participator.userId == getApp().globalData.userid) {
this.setData({
currentParStaus: item.confirmAttendance
})
}
})
})
})
},
// 重复会议的参加
confirmRepeatAtten(event) {
let type = ''
let type = 'only'
if (event.detail.value == 0) {
type = 'only'
} else {
type = 'all'
}
let data = {
value: 0,
value: 1,
scheduleId: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId,
type: 'only'
type: type
}
let data1 = {
id: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId
}
isParticipate(data).then(res => {
getScheduleDetail(data1).then(success => {
this.store.data.userList = success.data.data.userList
this.update()
success.data.data.userList.forEach((item, index) => {
if (item.participator.userId == getApp().globalData.userid) {
this.setData({
currentParStaus: item.confirmAttendance
})
}
})
})
})
},
// 重复会议取消参加
cancelRepeatAtten(event) {
let type = 'only'
if (event.detail.value == 0) {
type = 'only'
} else {
type = 'all'
}
let data = {
value: 1,
value: 0,
scheduleId: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId,
type: 'only'
type: type
}
let data1 = {
id: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId
}
isParticipate(data).then(res => {
getScheduleDetail(data1).then(success => {
this.store.data.userList = success.data.data.userList
this.update()
success.data.data.userList.forEach((item, index) => {
if (item.participator.userId == getApp().globalData.userid) {
this.setData({
currentParStaus: item.confirmAttendance
})
}
})
})
})
}
......
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