Skip to content

S
schedule
Commit 095eb566 by fengzhaoyu
Options

fix: 选人

parent 53ee4609
Showing with 166 additions and 125 deletions
components/toast/toast.js
......@@ -4,7 +4,7 @@ Component({
},
props: {
showToast: false,
duration: 1000,
duration: 2000,
title: '保存成功',
toastIcon: 'iconcanjia3'
......
pages/meetingDetail/meetingDetail.acss
......@@ -139,6 +139,8 @@ page {
}
.icon {
width: 36rpx;
height: 100%;
vertical-align: middle;
color: #0a0a0a;
font-size: 36rpx;
......@@ -150,7 +152,7 @@ input {
caret-color: #3070F2;
padding-left: 0;
height: 52rpx;
line-height: 52rpx;
/* line-height: 52rpx; */
}
.createTitle {
......@@ -239,7 +241,7 @@ input {
.close {
font-size: 32rpx;
color: rgba(10, 10, 10, 0.3)
color: rgba(10, 10, 10, 0.3)!important;
}
.repeatModal {
......@@ -592,4 +594,17 @@ input {
height: 68rpx;
width: 100%;
background: #fff;
}
.iconicon_description1 {
color: rgba(10, 10, 10, 0.4)!important;
}
.iconright {
font-size: 30rpx;
color: rgba(10, 10, 10, 0.3)!important;
}
.addPadding {
padding-bottom: 270rpx;
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
......@@ -95,7 +95,7 @@
{{$data.participatorList.length}}位参会人
</view>
<view class="conflictStatus" a:if="{{conflictPeople.length}}">
{{conflictPeople.length}}人会议安排冲突
{{conflictPeople.length}}人日程安排冲突
</view>
</view>
<view class="iconright iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
......@@ -202,7 +202,7 @@
<!-- 动态列表 -->
<import src="../../template/avater/index.axml"/>
<import src="../../template/affairBlank/index.axml"/>
<view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}}" onTap="hideFileOperate">
<view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
<view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
<block a:if="{{!affairLoading}}">
<block a:for="{{affairList}}">
......
pages/meetingDetail/meetingDetail.js
......@@ -28,7 +28,7 @@ create.Page({
{ id: 1, text: '每天', icon: '', repeatable: 1, recurrenceModel: { model: 'daily', interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: null } },
{ id: 2, text: '每周', icon: '', repeatable: 1, recurrenceModel: { model: 'weekly', interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: ['MO'] } },
{ id: 3, text: '每周的工作日', icon: '', repeatable: 1, recurrenceModel: { model: 'weekly', interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: ['MO', 'TU', 'WE', 'TH', 'FR'] } },
{ id: 4, text: '每月', icon: '', repeatable: 1, recurrenceModel: { model: 'absoluteMonthly', daysOfMonth: ['23'], interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: null } }
{ id: 4, text: '每月', icon: '', repeatable: 1, recurrenceModel: { model: 'absolute_Monthly', daysOfMonth: ['23'], interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: null } }
],
meetingWayList: [
{ id: 0, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
......@@ -850,8 +850,8 @@ create.Page({
},
// 重置时间
reSetTime() {
this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/'-'/g, '/')
this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/'-'/g, '/')
this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/-/g, "/")
this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/-/g, "/")
this.update()
this.setData({
week: this.data.weekList[new Date(this.$store.data.originalData.startTime).getDay()],
......@@ -860,7 +860,7 @@ create.Page({
// 重置地点
reSetLocation() {
this.$store.data.locationName = this.$store.data.originalData.location.locationName
this.$store.data.roomId = this.$store.data.originalData.meetingRoomId
this.$store.data.roomId = this.$store.data.originalData.meetingRoomId === -1 ? '' : this.$store.data.originalData.meetingRoomId
this.update()
},
// 重置人物
......@@ -989,6 +989,7 @@ create.Page({
recurrenceModel: this.$store.data.originalData.repeatable ? { model: this.storer.data.originalData.recurrenceModel.model, daysOfMonth: this.$store.data.originalData.recurrenceModel.daysOfMonth, interval: 1, initialTime: this.$store.data.originalData.recurrenceModel.initialTime, terminateTime: this.$store.data.originalData.recurrenceModel.terminateTime, weekDayList: this.$store.data.originalData.recurrenceModel.weekDayList } : { model: 'no_repeat' }
})
}).then(res => {
observer.notice(res.data.data)
this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
this.$store.data.originalData.repeatable = this.data.repeatable
this.update()
......@@ -1045,7 +1046,7 @@ create.Page({
latitude: '-999',
locationName: this.$store.data.locationName
},
meetingRoomId: this.$store.data.roomId
meetingRoomId: !!this.$store.data.roomId ? this.$store.data.roomId : -1
}
this.modifySchedule(dataLocation, needNotice).catch(err => {
this.$store.data.locationName = this.$store.data.originalData.location.locationName
......@@ -1105,7 +1106,7 @@ create.Page({
recurrenceModel: this.data.comListData.repeatList[2].recurrenceModel
})
})
} else if (this.data.recurrenceModel.model === 'absoluteMonthly') {
} else if (this.data.recurrenceModel.model === 'absolute_Monthly') {
let dataRepeat5 = {
startTime: this.$store.data.startTime.replace(/\//g, "-"),
endTime: this.$store.data.endTime.replace(/\//g, "-"),
......
pages/outLookContact/outLookContact.js
import { getUserScheduleInTime } from '../../api/request.js'
import { throttle } from './../../utils/utils.js'
import pageStore from '../participantsDetail/store';
import create from 'dd-store'
// 传递给组件toast的所有数据
const conToastData = {
showToast: false,
title: '保存成功'
title: '邮箱格式错误'
}
create.Page({
store: pageStore,
useAll: true,
data: {
$data: null,
outlookContact: [],
......@@ -17,6 +19,7 @@ create.Page({
conToastData: conToastData,
currentPeople: '',
value: '',
toPage: ''
},
onLoad(event) {
const _that = this
......@@ -27,9 +30,21 @@ create.Page({
scheduleItem: scheduleItem
})
}
if (event.toPage) {
this.setData({
toPage: event.toPage
})
}
let outlookContact = []
for (let value of this.$store.data.participatorList) {
let userList = []
if (!this.data.scheduleItem || !this.data.toPage) {
userList = this.$store.data.participatorList
} else {
userList = this.store.data.contactPeople
}
for (let value of userList) {
if (value.platform === 'outlook') {
outlookContact.push(value)
}
......@@ -51,7 +66,7 @@ create.Page({
},
// 添加email
addEmail() {
let reg = /^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/
let reg = /^(?!.* )[a-zA-Z0-9_-]+/
if (!!this.data.value) {
if (reg.test(this.data.value)) {
let outlookContact = this.data.outlookContact
......@@ -69,9 +84,8 @@ create.Page({
this.conflictPeople()
}
else {
dd.alert({
content: '请输入正确的邮箱格式',
buttonText: '确定'
this.setData({
'conToastData.showToast': true
})
}
}
......@@ -99,38 +113,38 @@ create.Page({
}
return Object.values(containt)
},
// 创建的时候保存
createSave() {
dd.navigateBack({
delta: 1
})
},
// 编辑的时候保存
editSave() {
this.$store.data.updateInfo.isUpate = true
this.$store.data.updateInfo.updateType = 'operate_user'
this.update()
dd.navigateBack({
delta: 1
})
},
// 保存
save() {
this.$store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar, platform: 'dingtalk' })
this.$store.data.participatorUserId.push(getApp().globalData.userid)
let userList = []
let userId = []
userList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar, platform: 'dingtalk' })
userId.push(getApp().globalData.userid)
for (let value of this.data.outlookContact) {
this.$store.data.participatorList.push(value)
this.$store.data.participatorUserId.push(value.userId)
userList.push(value)
userId.push(value.userId)
}
this.$store.data.participatorList = this.setArrary(this.$store.data.participatorList)
this.$store.data.participatorUserId = [...new Set(this.$store.data.participatorUserId)]
this.update()
if (!!this.data.scheduleItem) {
this.editSave()
userList = this.setArrary(userList)
userId = [...new Set(userId)]
if (!this.data.scheduleItem || !this.data.toPage) {
this.$store.data.participatorList.push(...userList)
this.$store.data.participatorUserId.push(...userId)
this.$store.data.participatorList = this.setArrary(this.$store.data.participatorList)
this.$store.data.participatorUserId = [...new Set(this.$store.data.participatorUserId)]
} else {
this.createSave()
this.store.data.contactPeople.push(...userList)
this.store.data.contactPeopleId.push(...userId)
this.store.data.contactPeople = this.setArrary(this.store.data.contactPeople)
this.store.data.contactPeopleId = [...new Set(this.store.data.userId)]
if (this.store.data.contactPeople != this.$store.data.originalData.userList) {
this.$store.data.updateInfo.isUpate = true
this.$store.data.updateInfo.updateType = 'operate_user'
}
}
this.update()
dd.navigateBack({
delta: 1
})
},
// 选择弹窗
onSelectPopup(event) {
......
pages/participantsDetail/participantsDetail.acss
......@@ -59,7 +59,7 @@ page {
.close {
position: absolute;
right: 32rpx;
color: #8E939D;
color: rgba(10, 10, 10, 0.3);
font-size: 0.3rem;
}
......
pages/participantsDetail/participantsDetail.axml
<view class="participantsDetail">
<view class="peopleContaint">
<view class="peopleList" a:for="{{$data.participatorList}}" a:for-item="item">
<view class="peopleList" a:for="{{!!scheduleItem ? contactPeople : $data.participatorList}}" a:for-item="item">
<view class="headImg">
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else>{{item.username.substring(0, 1)}}</text>
......
pages/participantsDetail/participantsDetail.js
import create from 'dd-store'
import pageStore from './store';
import { checkFullScren } from "../../utils/checkFullScren";
import { modifySchedule, addSchedule, getUserScheduleInTime, getHomeUserSchedule } from '../../api/request.js'
// 传给组件 hList 水平排列 所有数据 comHListData
......@@ -18,8 +17,9 @@ const comPopupData = {
popupShow: false
}
create.Page({
store: pageStore,
useAll: true,
data: {
store: pageStore,
$data: null,
scheduleItem: '',
conflictPeople: [],
......@@ -27,22 +27,27 @@ create.Page({
currentPeople: '',
comHListData: comHListData,
comPopupData: comPopupData,
isClick: false,
isIPX: false
},
onLoad(event) {
this.reset()
if (event.scheduleItem) {
let scheduleItem = JSON.parse(event.scheduleItem)
this.setData({
scheduleItem: scheduleItem
})
// for (let value of this.$store.data.participatorList) {
// this.store.data.contactPeople.push(value)
// this.store.data.contactPeopleId.push(value.userId)
// this.update()
// }
}
let contactPeople = []
let contactPeopleId = []
for (let value of this.$store.data.participatorList) {
contactPeople.push(value)
contactPeopleId.push(value.userId)
}
this.store.data.contactPeople = contactPeople
this.store.data.contactPeopleId = contactPeopleId
this.update()
}
this.setData({
isIPX: checkFullScren(),
currentPeople: getApp().globalData.userid
......@@ -51,16 +56,10 @@ create.Page({
},
onShow() {
dd.setNavigationBar({
title: `参会人(${this.$store.data.participatorList.length}人）`
})
this.getParticipatorLength()
this.conflictPeople()
},
// 添加参会人 钉钉选人
// 添加参会人 钉钉选人
addParticipator() {
const _that = this
let require = []
......@@ -71,12 +70,19 @@ create.Page({
outLookConcat.push(participator)
}
}
if (!_that.data.scheduleItem || this.$store.data.originalData.organizer === getApp().globalData.userid) {
console.log(_that.$store.data.participatorUserId)
// 创建的 可选 必选
if (!_that.data.scheduleItem) {
select = _that.$store.data.participatorUserId
require = [getApp().globalData.userid]
} else {
select = _that.$store.data.participatorUserId
}
// 编辑 发起人的可选必选
else if (this.$store.data.originalData.organizer === getApp().globalData.userid) {
select = _that.store.data.contactPeopleId
require = [getApp().globalData.userid]
}
// 编辑 参会人可选必选
else {
select = _that.store.data.contactPeopleId
require = [...this.$store.data.originUsersId]
}
select = _that.selectedelRequired([...require], [...select]).pickedUsers
......@@ -108,10 +114,17 @@ create.Page({
peopleId.push(value.userId)
}
people = _that.setArrary(people.concat(outLookConcat))
_that.$store.data.participatorList = people
_that.$store.data.participatorUserId = peopleId
_that.update()
// 创建
if (!_that.data.scheduleItem) {
_that.$store.data.participatorList = people
_that.$store.data.participatorUserId = peopleId
_that.update()
} else {
_that.store.data.contactPeople = people
_that.store.data.contactPeopleId = peopleId
_that.update()
}
},
fail: function (err) {
}
......@@ -120,35 +133,52 @@ create.Page({
// 删除参会人
delParticipants(event) {
let userId = event.target.dataset.userId
this.$store.data.participatorList.forEach((item, index) => {
let userIdList = []
let userList = []
if (!!this.data.scheduleItem) {
userList = this.store.data.contactPeople
userIdList = this.store.data.contactPeopleId
} else {
userList = this.$store.data.participatorList
userIdList = this.$store.data.participatorUserId
}
userList.forEach((item, index) => {
if (userId === item.userId) {
let people = [...this.$store.data.participatorList]
let people = [...userList]
people.splice(index, 1)
this.$store.data.participatorList = people
if (!!this.data.scheduleItem) {
this.store.data.contactPeople = people
} else {
this.$store.data.participatorList = people
}
this.update()
return
}
})
this.$store.data.participatorUserId.forEach((item, index) => {
userIdList.forEach((item, index) => {
if (userId === item) {
let peopleId = [...this.$store.data.participatorUserId]
let peopleId = [...userIdList]
peopleId.splice(index, 1)
console.log(peopleId)
this.$store.data.participatorUserId = peopleId
if (!!this.data.scheduleItem) {
this.store.data.contactPeopleId = peopleId
} else {
this.$store.data.participatorUserId = peopleId
}
this.update()
return
}
})
this.getParticipatorLength()
this.conflictPeople()
},
// 编辑时候的保存
editSave() {
this.setData({
isClick: true
})
if (this.$store.data.originUsers != this.$store.data.participatorList) {
if (this.$store.data.originUsers != this.store.data.contactPeople) {
this.$store.data.updateInfo.isUpate = true
this.$store.data.updateInfo.updateType = 'operate_user'
this.$store.data.participatorList = this.store.data.contactPeople
this.$store.data.participatorUserId = this.store.data.contactPeopleId
this.update()
}
dd.navigateBack({
......@@ -160,7 +190,21 @@ create.Page({
saveInfo() {
this.editSave()
},
// 获取参会人长度
getParticipatorLength() {
const length = !!this.data.scheduleItem ? this.store.data.contactPeople.length : this.$store.data.participatorList.length
dd.setNavigationBar({
title: `参会人(${length}人）`
})
},
// 重置参会人
reset() {
this.store.data.contactPeople = []
this.store.data.contactPeopleId = []
this.update()
},
// 展示弹窗
showPopup() {
this.setData({
......@@ -189,7 +233,7 @@ create.Page({
this.setData({
'comPopupData.popupShow': false
})
dd.navigateTo({ url: `./../outLookContact/outLookContact?scheduleItem=${JSON.stringify(this.data.scheduleItem)}` })
dd.navigateTo({ url: `./../outLookContact/outLookContact?scheduleItem=${JSON.stringify(this.data.scheduleItem)}&toPage=participantsDetail` })
break;
}
},
......@@ -202,34 +246,6 @@ create.Page({
'centerPopup.showCenterPopup': true
})
},
// 数组取差值 原先的数组与现在的比较 增加与减少
arrayPoor(origin, now) {
let originMap = new Map()
let nowMap = new Map()
let add = []
let del = []
for (let x of origin) {
originMap.set(x.userId, x)
}
for (let x of now) {
nowMap.set(x.userId, x)
let status1 = originMap.get(x.userId)
if (!status1) {
add.push(x)
}
}
for (let x of origin) {
let status2 = nowMap.get(x.userId)
if (!status2) {
del.push(x)
}
}
return {
addUserList: add,
deleteUserList: del
}
},
// 数组去重
setArrary(arr, userId) {
console.log(arr)
......@@ -241,8 +257,14 @@ create.Page({
},
// 会议冲突
conflictPeople() {
let users = []
let userIds = []
for (let item of this.$store.data.participatorList) {
if (!!this.data.scheduleItem) {
users = this.store.data.contactPeople
} else {
users = this.$store.data.participatorList
}
for (let item of users) {
userIds.push(item.userId)
}
......@@ -289,20 +311,6 @@ create.Page({
requiredUsers: req,
pickedUsers: pic
}
},
// 页面卸载
onUnload() {
if (this.data.isClick === false && !!this.data.scheduleItem) {
this.reSetPeople()
}
},
// 重置人
reSetPeople() {
this.$store.data.updateInfo.isUpate = false
this.$store.data.updateInfo.updateType = ''
this.$store.data.participatorList = this.$store.data.originUsers
this.$store.data.participatorUserId = this.$store.data.originUsersId
this.update()
}
});
stores/exampleStore.js
......@@ -15,6 +15,7 @@ class Store {
updateType: '',
isUpate: false
},
onceMeetingContent: null
}
}
export default new Store()
\ No newline at end of file
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