Skip to content

S
schedule
Commit 164c7af5 by liang ce
Options

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

parents c93eea23 54f4b3f5
Showing with 86 additions and 52 deletions
api/request.js
const app = getApp();
import $http from "./http";
import $binding from "./binding";
// 区域标签树
export function getRoomTree() {
return $http({
method: "get",
url: "/admin/label/tree?scene=meeting_room_location"
});
}
// 获取预定会议室列表
export function getReserveRoomList(data) {
......
components/centerPopup/centerPopup.acss
......@@ -3,7 +3,8 @@
width: 100%;
position: fixed;
top: 0;
background: rgba(0, 0, 0, 0.12)
background: rgba(0, 0, 0, 0.12);
z-index: 999;
}
.popupWindowCenter {
......@@ -15,6 +16,8 @@
border-radius: 10rpx;
top: 400rpx;
background: #fff;
animation: amplification 0.2s ease;
transform: none;
}
.list {
......
components/centerPopup/centerPopup.axml
<view class="popupWindow" a:if="{{centerPopup}}">
<view class="popupWindowCenter">
<view class="list">
向参会者发送会议更新通知？
</view>
<view class="list" a:for="{{centerPopupList}}" onTap="selectSend" data-item="{{item}}">
{{item.text}}
</view>
......
components/popup/index.acss
......@@ -9,7 +9,7 @@
bottom: 0;
left: 0;
right: 0;
background-color: rgba(0, 0, 0, 0.4);
background-color: rgba(0, 0, 0, 0.12);
opacity: 0;
pointer-events: none;
}
......@@ -41,6 +41,7 @@
}
.dm-popup-show .dm-popup-content {
animation: showAnimation 0.2s ease;
transform: none;
}
......
components/selectPopup/selectPopup.acss
......@@ -14,6 +14,8 @@
left: 16rpx;
right: 16rpx;
overflow: hidden;
animation: showAnimation 0.2s ease;
transform: none;
}
.selectPopupItem {
......
pages/createMeeting/createMeeting.axml
<view class="createMeeting">
<view class="createMeeting ">
<!-- title remark 标题 描述 -->
<view class="createTitle">
<view class="title">
......
pages/index/index.js
......@@ -115,7 +115,8 @@ create.Page({
}).then(res => {
if (!res.data.data) {
this.setData({
listLoading: false
listLoading: false,
dynamicList: []
});
return;
}
......@@ -739,8 +740,8 @@ create.Page({
maxClickCount--;
if (maxClickCount == 0) {
dd.alert({
content: "版本号199"
});
content: "版本号207"
})
maxClickCount = 5;
}
}
......
pages/meetingDetail/meetingDetail.axml
<block a:if="{{getData}}">
<view class=" {{forbiddenScroll ? 'metingDetail' : ''}}">
<view class=" {{(popupShow || show || centerPopup.showCenterPopup || conToastData.showToast || conSelectPopupData.showSelectPopup )? 'metingDetail' : ''}}">
<import src="../../template/deleteBtn/index.axml"/>
<view class="hideDetail" a:if="{{isExpand}}">
<view class="hideTitle">
......@@ -109,7 +109,7 @@
<view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}">
</view>
</view>
<view class="name">{{item.name}}</view>
<!--<view class="name">{{item.name}}</view> -->
</view>
<view class="addPeople iconfont iconicon_add1" catchTap="showPopup" data-type='participator'></view>
</view>
......@@ -230,7 +230,7 @@
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
</view>
</block>
<view a:else>正在加载</view>
<view a:else></view>
<popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
<meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" isIPX="{{isIPX}}"></meeting-time-picker>
<hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
......
pages/meetingDetail/meetingDetail.js
......@@ -79,8 +79,7 @@ create.Page({
showCenterPopup: false,
centerPopupList: [
{ id: 0, text: '不发送通知' },
{ id: 1, text: '发送通知' },
{ id: -1, text: '取消编辑' }
{ id: 1, text: '发送通知' }
],
centerPopupId: ''
},
......@@ -107,7 +106,6 @@ create.Page({
editType: '',
confirmAttendance: null,
isExpand: false,
forbiddenScroll: false,
placeholder: ''
},
onShow() {
......@@ -155,7 +153,11 @@ create.Page({
editType: this.$store.data.updateInfo.updateType
})
} else {
this.isChange(this.$store.data.updateInfo.updateType, 'only')
this.setData({
editType: this.$store.data.updateInfo.updateType,
'centerPopup.showCenterPopup': true
})
// this.isChange(this.$store.data.updateInfo.updateType, 'only')
}
} else {
this.reSetLocation()
......@@ -164,22 +166,8 @@ create.Page({
updateType: ''
}
}
break;
}
} else {
// if (this.$store.data.updateInfo.updateType === 'operate_user') {
// this.reSetUsers()
// } else if (this.$store.data.updateInfo.updateType === 'modify_location') {
// this.reSetTime()
// this.reSetLocation()
// }
// this.$store.data.updateInfo = {
// isUpate: false,
// updateType: ''
// }
}
},
onLoad(event) {
......@@ -363,7 +351,10 @@ create.Page({
editType: 'modify_location'
})
} else {
this.isChange('modify_location', 'only')
this.setData({
editType: 'modify_location',
'centerPopup.showCenterPopup': true
})
}
break
case 'meetingWayModel':
......@@ -377,15 +368,11 @@ create.Page({
this.isChange('meeting_way', 'only')
}
}
this.setData({
forbiddenScroll: false
})
},
// 关闭popup 点击mark
closePopup() {
this.setData({
popupShow: false,
forbiddenScroll: false
})
},
// 选择循环机制 选择会议方式 选择时间 会前提醒 出现popup弹窗
......@@ -394,7 +381,6 @@ create.Page({
let complete = false
let multiple = false
let popupTitle = ''
let forbiddenScroll = false
switch (event.currentTarget.dataset.type) {
case 'meetingWayModel':
iconType = 'image',
......@@ -413,7 +399,6 @@ create.Page({
break
case 'time':
popupTitle = '选择会议时间'
forbiddenScroll = true
break
case 'aheadTime':
popupTitle = '选择会前提醒'
......@@ -423,7 +408,6 @@ create.Page({
break
}
this.setData({
forbiddenScroll: forbiddenScroll,
popupShow: true,
popupTitle: popupTitle,
comType: event.currentTarget.dataset.type,
......@@ -602,7 +586,6 @@ create.Page({
'conSelectPopupData.selectType': 'common',
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
editType: '',
forbiddenScroll: false
})
this.resetRepeatList()
if (this.data.repeatable) {
......@@ -611,7 +594,11 @@ create.Page({
editType: 'modify_time'
})
} else {
this.isChange('modify_time', 'only')
this.setData({
editType: 'modify_time',
'centerPopup.showCenterPopup': true
})
// this.isChange('modify_time', 'only')
}
},
// 选择会前提醒时间
......@@ -717,7 +704,7 @@ create.Page({
const _that = this
switch (this.data.conSelectPopupData.selectType) {
case 'common':
if (this.data.editType === 'operate_user' || this.data.editType === 'modify_location' || this.data.editType === 'modify_time') {
if (this.data.editType === 'modify_location' || this.data.editType === 'modify_time') {
this.setData({
'centerPopup.showCenterPopup': true
})
......@@ -779,7 +766,8 @@ create.Page({
planDate: this.data.scheduleItem.planDate
}
deleteSchedule(data).then(res => {
_that.$store.data.indexNeedUpdate = true
_that.$store.data.indexNeedUpdate = true;
_that.$store.data.isIndexAffairListNeedUpdate = true;
_that.update()
dd.navigateBack({
delta: 1
......@@ -798,7 +786,11 @@ create.Page({
// 选择发不发通知
onSelectSend(event) {
if (event.currentTarget.dataset.item.id > -1) {
this.isChange(this.data.editType, this.data.conSelectPopupData.selectPopupId, event.currentTarget.dataset.item.id)
if (this.$store.data.originalData.repeatable === 1) {
this.isChange(this.data.editType, this.data.conSelectPopupData.selectPopupId, event.currentTarget.dataset.item.id)
} else {
this.isChange(this.data.editType, 'only', event.currentTarget.dataset.item.id)
}
} else {
switch (this.data.editType) {
case 'operate_user':
......@@ -1055,7 +1047,7 @@ create.Page({
endTime: this.$store.data.endTime.replace(/\//g, "-"),
modifyContent: 'modify_time'
}
this.isChange(dat2Time1)
this.isChange('modify_time', modifyModel, needNotice)
}
......@@ -1110,7 +1102,7 @@ create.Page({
})
}
this.modifySchedule(data, needNotice)
// this.modifySchedule(data, needNotice)
})
break
case 'aheadTimes':
......@@ -1194,7 +1186,8 @@ create.Page({
deleteModel: 'only'
}
deleteSchedule(data).then(res => {
_that.$store.data.indexNeedUpdate = true
_that.$store.data.indexNeedUpdate = true;
_that.$store.data.isIndexAffairListNeedUpdate = true;
_that.update()
dd.navigateBack({
delta: 1
......@@ -1527,7 +1520,7 @@ create.Page({
})
},
//创建任务
complete() {
complete: throttle(function () {
const { currentTask } = this.store.data;
const postData = {
"groupId": this.data.scheduleItem.groupId,
......@@ -1560,7 +1553,13 @@ create.Page({
this.update();
}
})
},
}),
// throttle
// complete() {
// debugger
// },
//
expand() {
this.setData({
......
pages/outLookContact/outLookContact.js
......@@ -131,6 +131,10 @@ create.Page({
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)]
if (!this.data.toPage) {
this.$store.data.updateInfo.isUpate = true
this.$store.data.updateInfo.updateType = 'operate_user'
}
} else {
this.store.data.contactPeople.push(...userList)
this.store.data.contactPeopleId.push(...userId)
......
pages/place/place.js
......@@ -49,6 +49,9 @@ create.Page({
endTime: this.$store.data.endTime.replace(/\//g, "-")
}
queryAvailableMeetingRoomByTime(data).then(res => {
for (let value of res.data.data) {
value.meetingRoomFullName = `${value.meetingRoomFullName}-${value.name}`
}
that.setData({
availableMeetingRoom: res.data.data
})
......
stores/exampleStore.js
......@@ -21,7 +21,6 @@ class Store {
relatedAppNeedUpdate: false,
}
resetData() {
this.data.indexNeedUpdate = false;
this.data.roomId = ''
this.data.participatorList = []
this.data.participatorUserId = []
......@@ -32,8 +31,6 @@ class Store {
this.update();
}
resetEditData() {
this.data.onceMeetingContent = null
this.data.indexNeedUpdate = false;
this.data.roomId = ''
this.data.participatorList = []
this.data.originUsers = []
......
utils/flatTree.js 0 → 100644
let flatTreeMap = new Map()
export function getFlatTree(treeData) {
for (let value of treeData) {
if (value.children.length) {
flatTreeMap.set(value.id, value)
getFlatTree(value.children)
} else {
flatTreeMap.set(value.id, value)
}
}
console.log(flatTreeMap)
return flatTreeMap
}
\ No newline at end of file
yarn.lock
......@@ -2,10 +2,10 @@
# yarn lockfile v1
dd-store@^1.8.4:
version "1.8.4"
resolved "https://registry.yarnpkg.com/dd-store/-/dd-store-1.8.4.tgz#6a8e58d4f8acf60259f7357caf0d5c6e74e5f8ef"
integrity sha512-UKA9nrW5biJ1Pt7c4fKtFZ+4cgLyWuBMHao7PDigbUkVBug6aXDB5VvCZHqwDwf2ofiOa7e9wp5C1OVNaUEDzA==
dd-store@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/dd-store/-/dd-store-1.9.0.tgz#8f531e28b6991919bc60a17148fa9e1bba142397"
integrity sha512-bhIkQMcHjNTDGG03riSeLp4UfdOBqWqg+qFfqqwAvgBiARrYbrEWU/YVE5tOV6XOqyfozp+MpZP3SaFyOtuUrw==
luxon@^1.21.3:
version "1.22.2"
......
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