Skip to content

S
schedule
Commit a15b1efd by xiexiaoqin
Options

Merge branch 'dev' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into dev

parents 62ecd275 278ffddb
Showing with 75 additions and 41 deletions
PageComponents/myDynamic/myDynamic.js
......@@ -168,6 +168,8 @@ create.Component({
});
},
nextPage(event) {
this.$store.data.tabBarIndex = '0'
this.update()
dd.navigateTo({ url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(event.currentTarget.dataset.item)}` });
},
}
......
PageComponents/scheduleList/scheduleList.js
......@@ -46,9 +46,9 @@ create.Component({
this.getDate();
}
},
didUnmount() {},
didUnmount() { },
methods: {
getDate: throttle(function(e) {
getDate: throttle(function (e) {
let data = {
startTime: "2020-01-01 00:00:00",
endTime: "2025-12-30 23:59:59"
......@@ -82,7 +82,9 @@ create.Component({
});
});
}, 1000),
nextDetail: throttle(function(e) {
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(
......@@ -244,7 +246,7 @@ create.Component({
);
}
});
scheduleMap.forEach(function(value, key, map) {
scheduleMap.forEach(function (value, key, map) {
scheduleList.push(value);
});
return scheduleList;
......@@ -323,7 +325,7 @@ create.Component({
// 第一个月的第一天
let listWeek = new Date(year, 0, 1).getDay() === 0 ? 0 : 1;
let thisDay = new Date().toLocaleDateString();
DateMap.forEach(function(value, key, map) {
DateMap.forEach(function (value, key, map) {
const keyDate = new Date(key);
if (keyDate.getDay() === 0) {
let rangeYear1 = keyDate.getFullYear();
......
components/fileList/fileList.axml
......@@ -2,8 +2,8 @@
<view class="desc" a:if='{{fileView.description}}'>
{{fileView.description}}
</view>
<view class="task-list" a:if="{{fileView.fileInfos && fileView.fileInfos.length > 0}}">
<view class="file-box {{isCanDelete ? 'file-box-close': ''}}" a:for="{{ fileView.fileInfos}}" catchTap="preview" data-file="{{item}}">
<view class="task-list" a:if="{{fileView.fileInfos && fileView.fileInfos.length > 0}}" a:for="{{ fileView.fileInfos}}">
<view class="file-box {{isCanDelete ? 'file-box-close': ''}}" catchTap="preview" data-file="{{item}}">
<view class="file-icon {{item.fileType}}"></view>
<view class="file-title">
<text>{{item.fileName.slice(0, item.fileName.length - 5)}}</text>
......
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({
......
fonts/iconfont.acss
......@@ -7,7 +7,7 @@
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-size: 36rpx;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
......
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)]
}
......@@ -193,7 +193,7 @@ create.Page({
}
this.setData({
'comListData.repeatList': repeatList,
week: this.data.weekList[new Date(this.$store.data.startTime.replace(/\//g, "-")).getDay()]
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()]
})
},
......@@ -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 = '动态181';
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;
......@@ -438,6 +434,7 @@ input {
.participate>text {
margin-right: 10rpx;
color: #15BC83;
vertical-align: middle;
}
.noParticipateStatus {
......@@ -583,3 +580,7 @@ input {
.iconicon_repeat1 {
color: rgba(10, 10, 10, 0.4)
}
.participateText {
vertical-align: middle
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
......@@ -149,11 +149,12 @@
<view class="originStaus" a:if="{{confirmAttendance === -9}}">
<view catchTap="participate">
<text class="iconfont iconicon_Agreed1"></text>
<text>参加</text></view>
<text class="participateText">参加</text>
</view>
<text class="devider"></text>
<view catchTap="noParticipate">
<text class="iconfont iconicon_noAgreed1"></text>
<text>不参加</text>
<text class="participateText">不参加</text>
</view>
</view>
<!--参加状态-->
......@@ -171,13 +172,13 @@
<text class="devider"></text>
<view class="participate" catchTap="initialState">
<text class="iconfont iconicon_Agreed1"></text>
<text>参加</text>
<text class="participateText">参加</text>
</view>
</view>
<!--不参加状态 -->
<view class="noParticipateStatus" a:if="{{confirmAttendance === 0}}" catchTap="initialState">
<text class="iconfont iconicon_noAgreed1"></text>
<text>不参加</text>
<text class="participateText">不参加</text>
</view>
</view>
<view class="footerBottom">
......
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)]
}
......@@ -394,9 +391,8 @@ create.Page({
}
this.setData({
'comListData.repeatList': repeatList,
week: this.data.weekList[new Date(this.$store.data.startTime.replace(/\//g, "-")).getDay()]
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