Skip to content

S
schedule
Commit 1f029a45 by fengzhaoyu
Options

fix : bug 修改会议方式 修改时间改变重复规则 修改outLook添加连系人的方式 修改动态进入会议相亲会方式返回是日程列表的问题

parents 23c7519a d61946c8
Showing with 62 additions and 32 deletions
PageComponents/myDynamic/myDynamic.js
......@@ -170,7 +170,8 @@ create.Component({
});
},
nextPage(event) {
console.log(event.currentTarget.dataset.item)
this.$store.data.tabBarIndex = '0'
this.update()
dd.navigateTo({ url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(event.currentTarget.dataset.item)}` });
},
}
......
PageComponents/scheduleList/scheduleList.js
......@@ -82,6 +82,8 @@ create.Component({
});
}, 1000),
nextDetail: throttle(function (e) {
this.$store.data.tabBarIndex = '1'
this.update()
let item = e.target.dataset.item;
dd.navigateTo({
url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(
......
app.json
......@@ -11,5 +11,8 @@
"pages/participantsDetail/participantsDetail",
"pages/applicationDetails/applicationDetails",
"pages/attendeeList/attendeeList"
]
}
],
"window": {
"allowsBounceVertical": "NO"
}
}
\ No newline at end of file
components/list/list.js
......@@ -24,6 +24,7 @@ Component({
didUnmount() { },
methods: {
comSelectList(event) {
console.log(event, 2222)
if (this.props.multiple && event.currentTarget.dataset.item.id != -1) {
if (this.data.comSelectList.includes(-1)) {
this.setData({
......
pages/createMeeting/createMeeting.js
......@@ -15,8 +15,8 @@ create.Page({
],
meetingWayList: [
// { id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } },
{ id: 1, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
{ id: 2, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } }
{ id: 0, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
{ id: 1, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } }
],
comSelectListId: 0,
meetingWayModelId: null,
......@@ -183,7 +183,7 @@ create.Page({
value.recurrenceModel.initialTime = this.$store.data.startTime.replace(/\//g, "-").substring(0, 10)
value.recurrenceModel.terminateTime = this.getTwoYearToday(this.$store.data.startTime)
if (index === 2) {
value.recurrenceModel.weekDayList = [this.data.repeatWeek[new Date().getDay()]]
value.recurrenceModel.weekDayList = [this.data.repeatWeek[new Date(this.$store.data.startTime).getDay()]]
} else if (index === 4) {
value.recurrenceModel.daysOfMonth = [this.$store.data.startTime.replace(/\//g, "-").substring(8, 10)]
}
......@@ -315,12 +315,12 @@ create.Page({
this.$store.data.endTime = `${event.endTime}:00`
this.update()
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
this.setData({
popupShow: false,
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
})
this.conflictPeople()
this.resetRepeatList()
},
addSchedule: throttle(function () {
let data = {
......
pages/index/index.js
......@@ -28,7 +28,7 @@ create.Page({
let title = "动态";
switch (e.currentTarget.dataset.tabbar) {
case '0':
title = '动态182';
title = '动态185';
break;
case "1":
title = "日程";
......
pages/meetingDetail/meetingDetail.acss
@import "../../template/affairBlank/index.acss";
page {
background: rgba(232, 237, 240, 1);
}
.affair-list {
background: #fff;
padding: 48rpx 32rpx 220rpx 32rpx;
......
pages/meetingDetail/meetingDetail.axml
......@@ -208,7 +208,7 @@
<text class="iconfont iconicon_task1"></text>
</view>
<view class="title">
会议任务
会议任务
<text>{{item.createTime}}</text>
</view>
<task-list onShowPop="showPop" onSetCurrentTask="setCurrentTask" taskList="{{item.taskViewList}}" onChangeTaskStatusOnList="changeTaskStatusOnList"/>
......@@ -216,7 +216,7 @@
<view a:if="{{item.category == '2' && item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 }}" class='compose-column'>
<template is="avater" data="{{item: item.fileView.creatorInfo}}"/>
<view class="title">
{{item.fileView.creatorInfo.username}}
{{item.fileView.creatorInfo.username}}
<text>{{item.createTime}}</text>
</view>
<file-list fileView="{{item.fileView}}" organizer="{{organizer}}" currentPeople="{{currentPeople}}" onDeleteMeetingFile="deleteMeetingFile"/>
......
pages/meetingDetail/meetingDetail.js
......@@ -30,9 +30,8 @@ create.Page({
{ id: 4, text: '每月', icon: '', repeatable: 1, recurrenceModel: { model: 'absoluteMonthly', daysOfMonth: ['23'], interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: null } }
],
meetingWayList: [
// { id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } },
{ id: 1, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
{ id: 2, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } }
{ id: 0, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
{ id: 1, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } }
],
aheadTimesList: [
{ id: -1, text: '不提醒', icon: 'iconicon_cycle' },
......@@ -124,7 +123,6 @@ create.Page({
}
},
onLoad(event) {
this.reset()
dd.setNavigationBar({
title: `会议详情`
......@@ -179,9 +177,7 @@ create.Page({
this.setData({
confirmAttendance: res.data.data.confirmAttendance === null ? -9 : res.data.data.confirmAttendance,
organizer: res.data.data.organizer,
'comListData.meetingWayModelId': res.data.data.meetingWayModel.model === null ? null : (res.data.data.meetingWayModel.model === 'dingtalk' ? 2 : (res.data.data.meetingWayModel.model === 'zoom' ? 1 : 0)),
// 'scheduleItem.id': res.data.data.id,
// 'scheduleItem.groupId': res.data.data.groupId,
'comListData.meetingWayModelId': res.data.data.meetingWayModel.model === null ? null : (res.data.data.meetingWayModel.model === 'dingtalk' ? 1 : 0),
repeatable: res.data.data.repeatable,
recurrenceModel: res.data.data.repeatable ? { model: res.data.data.recurrenceModel.model, daysOfMonth: res.data.data.recurrenceModel.daysOfMonth, interval: 1, initialTime: res.data.data.recurrenceModel.initialTime, terminateTime: res.data.data.recurrenceModel.terminateTime, weekDayList: res.data.data.recurrenceModel.weekDayList } : { model: 'no_repeat' },
title: res.data.data.title,
......@@ -212,6 +208,7 @@ create.Page({
this.store.data.groupId = res.data.data.groupId;
this.update();
this.reload(this.data.scheduleItem.id);
this.resetRepeatList()
} else {
}
......@@ -384,7 +381,7 @@ create.Page({
value.recurrenceModel.initialTime = this.$store.data.startTime.replace(/\//g, "-").substring(0, 10)
value.recurrenceModel.terminateTime = this.getTwoYearToday(this.$store.data.startTime)
if (index === 2) {
value.recurrenceModel.weekDayList = [this.data.repeatWeek[new Date().getDay()]]
value.recurrenceModel.weekDayList = [this.data.repeatWeek[new Date(this.$store.data.startTime).getDay()]]
} else if (index === 4) {
value.recurrenceModel.daysOfMonth = [this.$store.data.startTime.replace(/\//g, "-").substring(8, 10)]
}
......@@ -396,7 +393,6 @@ create.Page({
'comListData.repeatList': repeatList,
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()]
})
},
// 选择完comList后的回调 重复 会议方式
selectComList(event) {
......@@ -420,6 +416,7 @@ create.Page({
this.resetRepeatList()
this.setData({
popupShow: false,
'conSelectPopupData.selectType': 'common',
'comListData.comSelectListId': event.currentTarget.dataset.item.id,
repeatable: event.currentTarget.dataset.item.repeatable,
recurrenceModel: event.currentTarget.dataset.item.recurrenceModel
......@@ -545,11 +542,12 @@ create.Page({
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
this.setData({
popupShow: false,
'conSelectPopupData.selectType': 'common',
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
editType: '',
forbiddenScroll: false
})
this.conflictPeople()
this.resetRepeatList()
if (this.data.repeatable) {
this.setData({
'conSelectPopupData.showSelectPopup': true,
......@@ -588,7 +586,6 @@ create.Page({
modifySchedule(Object.assign(data, obj)).then(res => {
if (res.data.code === 0) {
that.$store.data.indexNeedUpdate = true
that.$store.data.tabBarIndex = '1'
that.update()
if (this.$store.data.originalData.repeatable === 1 && !!res.data.data) {
observer.notice(res.data.data)
......@@ -681,7 +678,6 @@ create.Page({
isParticipate(data1).then(res => {
if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true
this.$store.data.tabBarIndex = '1'
this.update()
this.setData({
confirmAttendance: 0
......@@ -701,7 +697,6 @@ create.Page({
isParticipate(data).then(res => {
if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true
this.$store.data.tabBarIndex = '1'
this.update()
this.setData({
confirmAttendance: 1
......@@ -1003,6 +998,38 @@ create.Page({
this.$store.data.originalData.startTime = this.$store.data.startTime.replace(/\//g, "-")
this.$store.data.originalData.endTime = this.$store.data.endTime.replace(/\//g, "-")
this.update()
this.resetRepeatList()
if (this.data.recurrenceModel.model === 'weekly' && this.data.recurrenceModel.weekDayList.length === 1) {
let dataRepeat4 = {
startTime: this.$store.data.startTime.replace(/\//g, "-"),
endTime: this.$store.data.endTime.replace(/\//g, "-"),
modifyModel: modifyModel,
modifyContent: 'change_rule',
recurrenceModel: this.data.comListData.repeatList[2].recurrenceModel,
repeatable: this.data.repeatable
}
this.modifySchedule(dataRepeat4).then(() => {
this.setData({
recurrenceModel: this.data.comListData.repeatList[2].recurrenceModel
})
})
} else if (this.data.recurrenceModel.model === 'absoluteMonthly') {
let dataRepeat5 = {
startTime: this.$store.data.startTime.replace(/\//g, "-"),
endTime: this.$store.data.endTime.replace(/\//g, "-"),
modifyModel: modifyModel,
modifyContent: 'change_rule',
recurrenceModel: this.data.comListData.repeatList[4].recurrenceModel,
repeatable: this.data.repeatable
}
this.modifySchedule(dataRepeat5).then(() => {
this.setData({
recurrenceModel: this.data.comListData.repeatList[4].recurrenceModel
})
})
}
this.modifySchedule(data, needNotice)
})
break
case 'aheadTimes':
......@@ -1113,7 +1140,6 @@ create.Page({
isParticipate(data).then(res => {
if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true
this.$store.data.tabBarIndex = '1'
this.update()
this.setData({
confirmAttendance: 1
......@@ -1139,7 +1165,6 @@ create.Page({
isParticipate(data).then(res => {
if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true
this.$store.data.tabBarIndex = '1'
this.update()
this.setData({
confirmAttendance: 0
......@@ -1166,7 +1191,6 @@ create.Page({
isParticipate(data).then(res => {
if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true
this.$store.data.tabBarIndex = '1'
this.update()
this.setData({
confirmAttendance: -9
......
pages/outLookContact/outLookContact.axml
<view class="outLookContact">
<!-- 输入邮箱联系人 -->
<view class="addContact">
<input placeholder="请输入邮箱" onInput="onInput" value="{{value}}" focus="{{false}}" />
<input placeholder="请输入邮箱" onInput="onInput" value="{{value}}" onConfirm="addEmail" onBlur="addEmail"/>
<view class="icon iconfont iconicon_add " onTap="addEmail">
</view>
</view>
......
pages/outLookContact/outLookContact.js
......@@ -96,7 +96,9 @@ create.Page({
outlookContact: outlookContact
})
this.conflictPeople()
} else {
}
else if (!!this.data.value) { }
else {
dd.alert({
content: '请输入正确的邮箱格式',
buttonText: '确定'
......
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