Skip to content

S
schedule
Commit 64f0b5a9 by liang ce
Options

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

parents 48c35895 a31e1cb1
Showing with 263 additions and 205 deletions
PageComponents/scheduleList/scheduleList.js
...@@ -163,12 +163,13 @@ create.Component({ ...@@ -163,12 +163,13 @@ create.Component({
let rule = RRule.fromString( let rule = RRule.fromString(
`${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}` `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
); );
// rule.options.tzid = "Asia/Hong_Kong"; // console.log(rule, 'rule')
rule.options.tzid = "Asia/Hong_Kong";
// 改变时区 // 改变时区
// let rullAll = rule.all() let rullAll = rule.all()
// rule.all().map(item => { rule.all().map(item => {
// console.log(item.toLocaleDateString()) console.log(item.toLocaleDateString())
// }) })
// 判断是否需要剔除某一天 // 判断是否需要剔除某一天
if (item.excludePlanDates) { if (item.excludePlanDates) {
......
app.json
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"pages/scheduleDetail/scheduleDetail", "pages/scheduleDetail/scheduleDetail",
"pages/participantsDetail/participantsDetail", "pages/participantsDetail/participantsDetail",
"pages/applicationDetails/applicationDetails", "pages/applicationDetails/applicationDetails",
"pages/attendeeList/attendeeList" "pages/attendeeList/attendeeList",
"pages/aaaa/aaaa"
] ]
} }
\ No newline at end of file
components/list/list.js
...@@ -47,9 +47,9 @@ Component({ ...@@ -47,9 +47,9 @@ Component({
} else if (this.props.multiple && event.currentTarget.dataset.item.id == -1) { } else if (this.props.multiple && event.currentTarget.dataset.item.id == -1) {
this.setData({ this.setData({
comSelectList: [] comSelectList: [-1]
}) })
this.props.onCompelete([]) this.props.onCompelete([-1])
} }
else if (!this.props.multiple) { else if (!this.props.multiple) {
this.setData({ this.setData({
......
components/meetingTimePicker/meetingTimePicker.js
...@@ -193,6 +193,7 @@ Component({ ...@@ -193,6 +193,7 @@ Component({
if (this.props.endTime) { if (this.props.endTime) {
endDate = new Date(this.props.endTime); endDate = new Date(this.props.endTime);
} }
console.log(this.props)
this.changeStart(startDate); this.changeStart(startDate);
this.changeEnd(endDate); this.changeEnd(endDate);
......
pages/aaaa/aaaa.axml 0 → 100644
<view>
New Page
</view>
\ No newline at end of file
pages/aaaa/aaaa.js 0 → 100644
// import { RRule, RRuleSet, rrulestr } from 'rrule'
// Page({
// data: {},
// onLoad() {
// const rule = new RRule({
// freq: RRule.WEEKLY,
// interval: 5,
// byweekday: [RRule.MO, RRule.FR],
// dtstart: new Date(Date.UTC(2012, 1, 1, 10, 30)),
// until: new Date(Date.UTC(2012, 12, 31))
// })
// rule.all()
// ['2012-02-03T10:30:00.000Z',
// '2012-03-05T10:30:00.000Z',
// '2012-03-09T10:30:00.000Z',
// '2012-04-09T10:30:00.000Z',
// '2012-04-13T10:30:00.000Z',
// '2012-05-14T10:30:00.000Z',
// '2012-05-18T10:30:00.000Z',
// ]
// rule.between(new Date(Date.UTC(2012, 7, 1)), new Date(Date.UTC(2012, 8, 1)))
// ['2012-08-27T10:30:00.000Z',
// '2012-08-31T10:30:00.000Z']
// // rule.toString()
// // "DTSTART:20120201T093000Z\nRRULE:FREQ=WEEKLY;INTERVAL=5;UNTIL=20130130T230000Z;BYDAY=MO,FR"
// // rule.toText()
// // "every 5 weeks on Monday, Friday until January 31, 2013"
// },
// });
pages/aaaa/aaaa.json 0 → 100644
{}
\ No newline at end of file
pages/createMeeting/createMeeting.js
...@@ -43,7 +43,7 @@ create.Page({ ...@@ -43,7 +43,7 @@ create.Page({
weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'], weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
week: '', week: '',
isAcrossDay: false, isAcrossDay: false,
conflictPeople: [] conflictPeople: [],
}, },
showPop(event) { showPop(event) {
...@@ -55,6 +55,7 @@ create.Page({ ...@@ -55,6 +55,7 @@ create.Page({
this.setData({ this.setData({
show: false show: false
}) })
}, },
Complete(data) { Complete(data) {
this.closePop(); this.closePop();
...@@ -109,7 +110,7 @@ create.Page({ ...@@ -109,7 +110,7 @@ create.Page({
this.$store.data.originUsersId = [] this.$store.data.originUsersId = []
this.$store.data.locationName = '' this.$store.data.locationName = ''
this.$store.data.startTime = this.getTimes() this.$store.data.startTime = this.getTimes()
this.$store.data.endTime = this.getTimes(new Date(this.getTimes()).setMinutes(new Date(this.$store.data.startTime).getMinutes() + 30)) this.$store.data.endTime = this.getTimes(new Date().setMinutes(new Date().getMinutes() + 30))
this.update() this.update()
this.resetRepeatList() this.resetRepeatList()
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime) this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
...@@ -172,6 +173,7 @@ create.Page({ ...@@ -172,6 +173,7 @@ create.Page({
comType: event.currentTarget.dataset.type, comType: event.currentTarget.dataset.type,
'comListData.iconType': iconType 'comListData.iconType': iconType
}) })
}, },
resetRepeatList() { resetRepeatList() {
let index = 0 let index = 0
......
pages/meetingDetail/meetingDetail.acss
...@@ -541,4 +541,9 @@ input { ...@@ -541,4 +541,9 @@ input {
text-align: center; text-align: center;
background: rgb(234, 12, 40); background: rgb(234, 12, 40);
display: inline-block; display: inline-block;
}
.metingDetail {
overflow: hidden;
height: 100vh;
} }
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
<block a:if="{{getData}}"> <block a:if="{{getData}}">
<import src="../../template/deleteBtn/index.axml"/> <view class=" {{forbiddenScroll ? 'metingDetail' : ''}}">
<view class="hideDetail" a:if="{{isExpand}}"> <import src="../../template/deleteBtn/index.axml"/>
<view class="hideTitle"> <view class="hideDetail" a:if="{{isExpand}}">
<view class="hideTitle">
{{title}} {{title}}
</view> </view>
<view class="hideTime"> <view class="hideTime">
<text a:if="{{isAcrossDay}}"> <text a:if="{{isAcrossDay}}">
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
</text> </text>
<text a:else> <text a:else>
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
</text> </text>
</view> </view>
<view class="hideIcon iconfont iconicon_expand" onTap="expand"> <view class="hideIcon iconfont iconicon_expand" onTap="expand">
</view>
</view> </view>
</view> <view class="editeMeeting" a:else>
<view class="editeMeeting" a:else> <!-- title remark 标题 描述 -->
<!-- title remark 标题 描述 --> <view class="permissionContant">
<view class="permissionContant"> <view class="createTitle">
<view class="createTitle"> <view class="title">
<view class="title"> <input placeholder-class="placeholder" placeholder="请输入主题" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm"/>
<input placeholder-class="placeholder" placeholder="请输入主题" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm"/> <view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
<view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark"> </view>
</view>
<view class="remark" a:if="{{isShowRemark}}">
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" onConfirm="onConfirm"/>
</view> </view>
</view> </view>
<view class="remark" a:if="{{isShowRemark}}"> <view class="permission" a:if="{{currentPeople != organizer}}">
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" onConfirm="onConfirm"/>
</view> </view>
</view> </view>
<view class="permission" a:if="{{currentPeople != organizer}}"> <!-- roomId locationName 地点 -->
</view> <view class="permissionContant" a:if="{{$data.locationName || currentPeople === organizer}}">
</view> <view class="permission" a:if="{{currentPeople != organizer}}">
<!-- roomId locationName 地点 -->
<view class="permissionContant" a:if="{{$data.locationName || currentPeople === organizer}}">
<view class="permission" a:if="{{currentPeople != organizer}}">
</view>
<view class="place">
<view class="iconicon_room iconfont icon" a:if="{{roomId}}">
</view>
<view class="iconicon_location1 iconfont icon {{$data.locationName ? '' : 'noValueIcon'}}" a:else>
</view> </view>
<view class="placeContaint"> <view class="place">
<view class="noPlace" a:if="{{!$data.locationName}}" onTap="nextPage" data-nextPage="location"> <view class="iconicon_room iconfont icon" a:if="{{roomId}}">
添加地点
</view> </view>
<view class="hasplace" onTap="nextPage" data-nextPage="location" a:else> <view class="iconicon_location1 iconfont icon {{$data.locationName ? '' : 'noValueIcon'}}" a:else>
{{$data.locationName}}
</view> </view>
<view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName}}" data-close="location" catchTap="close"> <view class="placeContaint">
<view class="noPlace" a:if="{{!$data.locationName}}" onTap="nextPage" data-nextPage="location">
添加地点
</view>
<view class="hasplace" onTap="nextPage" data-nextPage="location" a:else>
{{$data.locationName}}
</view>
<view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName}}" data-close="location" catchTap="close">
</view>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- $data.startTime $data.endTime repeatable recurrenceModel 时间 重复 -->
<!-- $data.startTime $data.endTime repeatable recurrenceModel 时间 重复 --> <view class="permissionContant">
<view class="permissionContant"> <view class="time">
<view class="time"> <view class="iconicon_conflict iconfont icon">
<view class="iconicon_conflict iconfont icon"> </view>
</view> <view class="timeContaint">
<view class="timeContaint"> <view>
<view> <view class="timeText" catchTap="showPopup" data-type='time'>
<view class="timeText" catchTap="showPopup" data-type='time'> <text a:if="{{isAcrossDay}}">
<text a:if="{{isAcrossDay}}">
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
</text> </text>
<text a:else> <text a:else>
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
</text> </text>
<!-- 3月1日 周日 14:00-16:00 --> <!-- 3月1日 周日 14:00-16:00 -->
</view> </view>
<view class="repeatModal" a:if="{{comListData.comSelectListId !== 0}}" catchTap="showPopup" data-type='repeat'> <view class="repeatModal" a:if="{{comListData.comSelectListId !== 0}}" catchTap="showPopup" data-type='repeat'>
{{comListData.repeatList[comListData.comSelectListId].text}}重复 {{comListData.repeatList[comListData.comSelectListId].text}}重复
</view>
</view>
<view class="icon iconfont iconicon_open" catchTap="showPopup" data-type='repeat' a:if="{{comListData.comSelectListId == 0}}">
</view> </view>
</view>
<view class="icon iconfont iconicon_open" catchTap="showPopup" data-type='repeat' a:if="{{comListData.comSelectListId == 0}}">
</view> </view>
</view> </view>
<view class="permission" a:if="{{currentPeople != organizer}}">
</view>
</view> </view>
<view class="permission" a:if="{{currentPeople != organizer}}"> <!-- participatorList participatorUserId 参会人 -->
</view> <view class="participator">
</view> <view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}">
<!-- participatorList participatorUserId 参会人 -->
<view class="participator">
<view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}">
</view>
<view class="participatorContaint">
<view class="participatorText" a:if="{{$data.participatorList.length < 2}}" catchTap="showPopup" data-type='participator'>
添加参会人
</view> </view>
<view class="participatorList" a:else> <view class="participatorContaint">
<view class="participatorListTop"> <view class="participatorText" a:if="{{$data.participatorList.length < 2}}" catchTap="showPopup" data-type='participator'>
<view class="participatorText"> 添加参会人
<view> </view>
<view class="participatorList" a:else>
<view class="participatorListTop">
<view class="participatorText">
<view>
{{$data.participatorList.length}}位参会人 {{$data.participatorList.length}}位参会人
</view> </view>
<view class="conflictStatus" a:if="{{conflictPeople.length}}"> <view class="conflictStatus" a:if="{{conflictPeople.length}}">
{{conflictPeople.length}}人会议安排冲突 {{conflictPeople.length}}人会议安排冲突
</view>
</view> </view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view> </view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view> <view class="participatorListBottom">
</view> <view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
<view class="participatorListBottom"> <view class="headUrl">
<view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}"> <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
<view class="headUrl"> <text
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
<text
a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}} a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
</text> </text>
<view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}"> <view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}">
</view>
</view> </view>
<view class="name">{{item.name}}</view>
</view> </view>
<view class="name">{{item.name}}</view> <view class="addPeople iconfont iconicon_add1" catchTap="showPopup" data-type='participator'></view>
</view> </view>
<view class="addPeople iconfont iconicon_add1" catchTap="showPopup" data-type='participator'></view>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- meetingWay 会议方式 -->
<!-- meetingWay 会议方式 --> <view class="permissionContant" a:if="{{comListData.meetingWayList[comListData.meetingWayModelId].text || currentPeople === organizer}}">
<view class="permissionContant" a:if="{{comListData.meetingWayList[comListData.meetingWayModelId].text || currentPeople === organizer}}"> <!--<view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}"></view> -->
<!--<view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}"></view> --> <view class="meetingWay">
<view class="meetingWay"> <view class="iconicon_meet iconfont icon {{comListData.meetingWayModelId ? '' : 'noValueIcon'}}">
<view class="iconicon_meet iconfont icon {{comListData.meetingWayModelId ? '' : 'noValueIcon'}}">
</view>
<view class="meetingWayContent">
<view class="noWay" a:if="{{comListData.meetingWayModelId == null}}" catchTap="showPopup" data-type='meetingWayModel'>
会议方式
</view> </view>
<view class="hasWay" a:else catchTap="showPopup" data-type='meetingWayModel'> <view class="meetingWayContent">
<view class="noWay" a:if="{{comListData.meetingWayModelId == null}}" catchTap="showPopup" data-type='meetingWayModel'>
会议方式
</view>
<view class="hasWay" a:else catchTap="showPopup" data-type='meetingWayModel'>
{{comListData.meetingWayList[comListData.meetingWayModelId].text}} {{comListData.meetingWayList[comListData.meetingWayModelId].text}}
</view> </view>
<view class=" icon iconfont iconicon_close close" a:if="{{comListData.meetingWayModelId !== null}}" data-close="meetingWayModel" catchTap="close"> <view class=" icon iconfont iconicon_close close" a:if="{{comListData.meetingWayModelId !== null}}" data-close="meetingWayModel" catchTap="close">
</view>
</view> </view>
</view> </view>
<view class="permission" a:if="{{currentPeople != organizer}}">
</view>
</view> </view>
<view class="permission" a:if="{{currentPeople != organizer}}"> <!-- 删除该会议 -->
</view> <template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
</view> </view>
<!-- 删除该会议 --> <!-- 底部导航栏 -->
<template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/> <view class="footNav">
</view> <view class="footNavTop">
<!-- 底部导航栏 --> <view class="originStaus" a:if="{{confirmAttendance === null}}">
<view class="footNav"> <view catchTap="participate">
<view class="footNavTop"> <text class="iconfont iconicon_Agreed1"></text>
<view class="originStaus" a:if="{{confirmAttendance === null}}"> <text>参加</text></view>
<view catchTap="participate"> <text class="devider"></text>
<text class="iconfont iconicon_Agreed1"></text> <view catchTap="noParticipate">
<text>参加</text></view> <text class="iconfont iconicon_noAgreed1"></text>
<text class="devider"></text> <text>不参加</text>
<view catchTap="noParticipate"> </view>
</view>
<view class="participateStatus" a:if="{{confirmAttendance === 1}}">
<view class="remind" catchTap="showPopup" data-type="aheadTime">
<text class="iconfont iconicon_time1"></text>
<text class="remindTimeContaint" a:if="{{aheadTimes.length}}">
<text class="remindTime" a:for="{{comListData.aheadTimesList}}" a:if="{{aheadTimes.includes(item.id)}}">
{{item.text}}
</text>
</text>
<text class="noRemind" a:if="{{!aheadTimes.length}}">不提醒</text>
<text class="iconfont iconicon_share"></text>
</view>
<text class="devider"></text>
<view class="participate" catchTap="noParticipate">
<text class="iconfont iconicon_Agreed1"></text>
<text>参加</text></view></view>
<view class="noParticipateStatus" a:if="{{confirmAttendance === 0}}" catchTap="participate">
<text class="iconfont iconicon_noAgreed1"></text> <text class="iconfont iconicon_noAgreed1"></text>
<text>不参加</text> <text>不参加</text>
</view> </view>
</view> </view>
<view class="participateStatus" a:if="{{confirmAttendance === 1}}"> <view class="footerBottom">
<view class="remind" catchTap="showPopup" data-type="aheadTime"> <view onTap="showCreateTask" data-pop="{{title: '创建任务', type: 'createTask'}}">
<text class="iconfont iconicon_time1"></text> <text class="iconfont iconicon_task1"></text>任务
<text class="remindTimeContaint" a:if="{{aheadTimes.length}}"> </view>
<text class="remindTime" a:for="{{comListData.aheadTimesList}}" a:if="{{aheadTimes.includes(item.id)}}"> <view onTap="addMeetingFile">
{{item.text}} <text class="iconfont iconicon_data"></text>文件
</text>
</text>
<text class="noRemind" a:if="{{!aheadTimes.length}}">不提醒</text>
<text class="iconfont iconicon_share"></text>
</view> </view>
<text class="devider"></text> <text class="devider"></text>
<view class="participate" catchTap="noParticipate"> <view>
<text class="iconfont iconicon_Agreed1"></text> <text class="iconfont iconicon_share1"></text>
<text>参加</text></view></view> </view>
<view class="noParticipateStatus" a:if="{{confirmAttendance === 0}}" catchTap="participate">
<text class="iconfont iconicon_noAgreed1"></text>
<text>不参加</text>
</view>
</view>
<view class="footerBottom">
<view onTap="showCreateTask" data-pop="{{title: '创建任务', type: 'createTask'}}">
<text class="iconfont iconicon_task1"></text>任务
</view>
<view onTap="addMeetingFile">
<text class="iconfont iconicon_data"></text>文件
</view>
<text class="devider"></text>
<view>
<text class="iconfont iconicon_share1"></text>
</view> </view>
</view> </view>
</view> <centerpopup centerPopup="{{centerPopup.showCenterPopup}}" centerPopupList="{{centerPopup.centerPopupList}}" onSelectSend="onSelectSend"></centerpopup>
<centerpopup centerPopup="{{centerPopup.showCenterPopup}}" centerPopupList="{{centerPopup.centerPopupList}}" onSelectSend="onSelectSend"></centerpopup> <toast showToast="{{conToastData.showToast}}" title="{{conToastData.title}}" onToastHidden="onToastHidden"></toast>
<toast showToast="{{conToastData.showToast}}" title="{{conToastData.title}}" onToastHidden="onToastHidden"></toast> <selectpopup showSelectPopup="{{conSelectPopupData.showSelectPopup}}" selectPopupList="{{conSelectPopupData.selectType==='noParticipateStatus' ? conSelectPopupData.noParticipateStatusList : conSelectPopupData.selectType==='delSheudle' ? conSelectPopupData.delSheudleList : (conSelectPopupData.selectType === 'participateStatus' ? conSelectPopupData.participateStatusList : conSelectPopupData.editSaveList)}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
<selectpopup showSelectPopup="{{conSelectPopupData.showSelectPopup}}" selectPopupList="{{conSelectPopupData.selectType==='noParticipateStatus' ? conSelectPopupData.noParticipateStatusList : conSelectPopupData.selectType==='delSheudle' ? conSelectPopupData.delSheudleList : (conSelectPopupData.selectType === 'participateStatus' ? conSelectPopupData.participateStatusList : conSelectPopupData.editSaveList)}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup> <!-- 动态列表 -->
<!-- 动态列表 --> <import src="../../template/avater/index.axml"/>
<import src="../../template/avater/index.axml"/> <view class="affair-list" onTap="hideFileOperate">
<view class="affair-list" onTap="hideFileOperate"> <view class="affair-list-title">会议动态</view>
<view class="affair-list-title">会议动态</view> <block a:for="{{affairList}}">
<block a:for="{{affairList}}"> <view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
<view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'> <view class="avater task-avater">
<view class="avater task-avater"> <text class="iconfont iconicon_task1"></text>
<text class="iconfont iconicon_task1"></text> </view>
</view> <view class="title">
<view class="title">
会议任务 会议任务
<text>{{item.createTime}}</text> <text>{{item.createTime}}</text>
</view>
<task-list onShowPop="showPop" onSetCurrentTask="setCurrentTask" taskList="{{item.taskViewList}}" onChangeTaskStatusOnList="changeTaskStatusOnList"/>
</view> </view>
<task-list onShowPop="showPop" onSetCurrentTask="setCurrentTask" taskList="{{item.taskViewList}}" onChangeTaskStatusOnList="changeTaskStatusOnList"/> <view a:if="{{item.category == '2' && item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 }}" class='compose-column'>
</view> <template is="avater" data="{{item: item.fileView.creatorInfo}}"/>
<view a:if="{{item.category == '2' && item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 }}" class='compose-column'> <view class="title">
<template is="avater" data="{{item: item.fileView.creatorInfo}}"/>
<view class="title">
{{item.fileView.creatorInfo.username}} {{item.fileView.creatorInfo.username}}
<text>{{item.createTime}}</text> <text>{{item.createTime}}</text>
</view>
<file-list fileView="{{item.fileView}}" organizer="{{organizer}}" currentPeople="{{currentPeople}}" onDeleteMeetingFile="deleteMeetingFile"/>
</view> </view>
<file-list fileView="{{item.fileView}}" organizer="{{organizer}}" currentPeople="{{currentPeople}}" onDeleteMeetingFile="deleteMeetingFile"/> <view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
</block>
<view class="affair-placeholder" a:if="{{affairList.length <= 1}}">
<image mode="widthFix" src="../../assests/noDynamic.png"/>
<view class="affair-placeholder-text">我们不开无准备的会，快来上传会议文件吧。</view>
<view onTap="addMeetingFile" class="affair-placeholder-button">添加会议文件</view>
</view> </view>
<view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view> <!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
</block>
<view class="affair-placeholder" a:if="{{affairList.length <= 1}}">
<image mode="widthFix" src="../../assests/noDynamic.png"/>
<view class="affair-placeholder-text">我们不开无准备的会，快来上传会议文件吧。</view>
<view onTap="addMeetingFile" class="affair-placeholder-button">添加会议文件</view>
</view>
</view>
<!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
删除该会议</view></view> --> 删除该会议</view></view> -->
<popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup"> <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
<meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></meeting-time-picker> <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></meeting-time-picker>
<hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist> <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
<list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}"> <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
</list> </list>
</popup> </popup>
<popup show="{{show}}" onClose="closePop" title="{{pop.title}}"> <popup show="{{show}}" onClose="closePop" title="{{pop.title}}">
<!-- 任务创建弹出框 --> <!-- 任务创建弹出框 -->
<task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/> <task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>
<!-- 任务修改弹出框 --> <!-- 任务修改弹出框 -->
<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/> <task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
</popup> </popup>
</block> </view>
\ No newline at end of file </block>
\ No newline at end of file
pages/meetingDetail/meetingDetail.js
...@@ -105,7 +105,8 @@ create.Page({ ...@@ -105,7 +105,8 @@ create.Page({
editType: '', editType: '',
confirmAttendance: null, confirmAttendance: null,
isExpand: false, isExpand: false,
c: false forbiddenScroll: false
}, },
onShow() { onShow() {
console.log(this) console.log(this)
...@@ -172,7 +173,7 @@ create.Page({ ...@@ -172,7 +173,7 @@ create.Page({
this.setData({ this.setData({
confirmAttendance: res.data.data.confirmAttendance, confirmAttendance: res.data.data.confirmAttendance,
organizer: res.data.data.organizer, 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)), '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.id': res.data.data.id,
'scheduleItem.groupId': res.data.data.groupId, 'scheduleItem.groupId': res.data.data.groupId,
repeatable: res.data.data.repeatable, repeatable: res.data.data.repeatable,
...@@ -193,8 +194,8 @@ create.Page({ ...@@ -193,8 +194,8 @@ create.Page({
this.$store.data.originUsers = participatorList this.$store.data.originUsers = participatorList
this.$store.data.locationName = res.data.data.location.locationName this.$store.data.locationName = res.data.data.location.locationName
this.$store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId this.$store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId
this.$store.data.startTime = res.data.data.startTime.replace(/'-'/g, "\/") this.$store.data.startTime = res.data.data.startTime.replace(/-/g, "/")
this.$store.data.endTime = res.data.data.endTime.replace(/'-'/g, "\/") this.$store.data.endTime = res.data.data.endTime.replace(/-/g, "/")
this.$store.data.participatorList = participatorList this.$store.data.participatorList = participatorList
this.$store.data.participatorUserId = participatorUserId this.$store.data.participatorUserId = participatorUserId
this.$store.data.originUsersId = participatorUserId this.$store.data.originUsersId = participatorUserId
...@@ -293,6 +294,7 @@ create.Page({ ...@@ -293,6 +294,7 @@ create.Page({
this.update() this.update()
if (this.data.repeatable) { if (this.data.repeatable) {
this.setData({ this.setData({
'conSelectPopupData.selectType': 'common',
'conSelectPopupData.showSelectPopup': true, 'conSelectPopupData.showSelectPopup': true,
editType: 'modify_location' editType: 'modify_location'
}) })
...@@ -314,11 +316,15 @@ create.Page({ ...@@ -314,11 +316,15 @@ create.Page({
this.isChange('meeting_way', 'only') this.isChange('meeting_way', 'only')
} }
} }
this.setData({
forbiddenScroll: false
})
}, },
// 关闭popup 点击mark // 关闭popup 点击mark
closePopup() { closePopup() {
this.setData({ this.setData({
popupShow: false popupShow: false,
forbiddenScroll: false
}) })
}, },
// 选择循环机制 选择会议方式 选择时间 会前提醒 出现popup弹窗 // 选择循环机制 选择会议方式 选择时间 会前提醒 出现popup弹窗
...@@ -327,6 +333,7 @@ create.Page({ ...@@ -327,6 +333,7 @@ create.Page({
let complete = false let complete = false
let multiple = false let multiple = false
let popupTitle = '' let popupTitle = ''
let forbiddenScroll = false
switch (event.currentTarget.dataset.type) { switch (event.currentTarget.dataset.type) {
case 'meetingWayModel': case 'meetingWayModel':
iconType = 'image', iconType = 'image',
...@@ -345,6 +352,7 @@ create.Page({ ...@@ -345,6 +352,7 @@ create.Page({
break break
case 'time': case 'time':
popupTitle = '选择会议时间' popupTitle = '选择会议时间'
forbiddenScroll = true
break break
case 'aheadTime': case 'aheadTime':
popupTitle = '选择会前提醒' popupTitle = '选择会前提醒'
...@@ -354,6 +362,7 @@ create.Page({ ...@@ -354,6 +362,7 @@ create.Page({
break break
} }
this.setData({ this.setData({
forbiddenScroll: forbiddenScroll,
popupShow: true, popupShow: true,
popupTitle: popupTitle, popupTitle: popupTitle,
comType: event.currentTarget.dataset.type, comType: event.currentTarget.dataset.type,
...@@ -504,6 +513,7 @@ create.Page({ ...@@ -504,6 +513,7 @@ create.Page({
_that.conflictPeople() _that.conflictPeople()
if (_that.data.repeatable) { if (_that.data.repeatable) {
_that.setData({ _that.setData({
'conSelectPopupData.showSelectPopup': true, 'conSelectPopupData.showSelectPopup': true,
editType: 'operate_user' editType: 'operate_user'
}) })
...@@ -531,7 +541,8 @@ create.Page({ ...@@ -531,7 +541,8 @@ create.Page({
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime) this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
this.setData({ this.setData({
popupShow: false, popupShow: false,
editType: '' editType: '',
forbiddenScroll: false
}) })
this.conflictPeople() this.conflictPeople()
if (this.data.repeatable) { if (this.data.repeatable) {
...@@ -548,7 +559,7 @@ create.Page({ ...@@ -548,7 +559,7 @@ create.Page({
this.setData({ this.setData({
aheadTimes: event, aheadTimes: event,
popupShow: false, popupShow: false,
'comListData.aheadTimesListId': event.length == 0 ? [-1] : event 'comListData.aheadTimesListId': event
}) })
if (this.data.repeatable) { if (this.data.repeatable) {
this.setData({ this.setData({
...@@ -666,7 +677,6 @@ create.Page({ ...@@ -666,7 +677,6 @@ create.Page({
} }
isParticipate(data1).then(res => { isParticipate(data1).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
observer.notice(res.data.data)
this.setData({ this.setData({
confirmAttendance: 0, confirmAttendance: 0,
'conToastData.showToast': true, 'conToastData.showToast': true,
...@@ -684,7 +694,6 @@ create.Page({ ...@@ -684,7 +694,6 @@ create.Page({
} }
isParticipate(data).then(res => { isParticipate(data).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
observer.notice(res.data.data)
this.setData({ this.setData({
confirmAttendance: 1, confirmAttendance: 1,
'conToastData.showToast': true, 'conToastData.showToast': true,
...@@ -1202,7 +1211,6 @@ create.Page({ ...@@ -1202,7 +1211,6 @@ create.Page({
}); });
if (this.data.pop.type == 'updateTask') { if (this.data.pop.type == 'updateTask') {
const { currentTask } = this.store.data; const { currentTask } = this.store.data;
const { oldTask } = this.data; const { oldTask } = this.data;
......
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