Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
1721cd43
Commit
1721cd43
authored
Apr 19, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 添加邮箱修改 地点全名 样式修改
parent
1a2417e2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
109 additions
and
56 deletions
+109
-56
request.js
api/request.js
+7
-0
centerPopup.acss
components/centerPopup/centerPopup.acss
+4
-1
centerPopup.axml
components/centerPopup/centerPopup.axml
+3
-0
index.acss
components/popup/index.acss
+2
-1
selectPopup.acss
components/selectPopup/selectPopup.acss
+2
-0
createMeeting.axml
pages/createMeeting/createMeeting.axml
+1
-1
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+2
-2
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+31
-33
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+32
-11
outLookContact.js
pages/outLookContact/outLookContact.js
+4
-0
place.js
pages/place/place.js
+3
-0
scheduleList.js
pages/scheduleList/scheduleList.js
+0
-0
exampleStore.js
stores/exampleStore.js
+0
-3
flatTree.js
utils/flatTree.js
+14
-0
yarn.lock
yarn.lock
+4
-4
No files found.
api/request.js
View file @
1721cd43
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
View file @
1721cd43
...
...
@@ -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 file @
1721cd43
<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
View file @
1721cd43
...
...
@@ -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
View file @
1721cd43
...
...
@@ -14,6 +14,8 @@
left: 16rpx;
right: 16rpx;
overflow: hidden;
animation: showAnimation 0.2s ease;
transform: none;
}
.selectPopupItem {
...
...
pages/createMeeting/createMeeting.axml
View file @
1721cd43
<view class="createMeeting">
<view class="createMeeting
">
<!-- title remark 标题 描述 -->
<view class="createTitle">
<view class="title">
...
...
pages/meetingDetail/meetingDetail.axml
View file @
1721cd43
<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>
...
...
pages/meetingDetail/meetingDetail.js
View file @
1721cd43
...
...
@@ -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
})
...
...
@@ -799,8 +786,12 @@ create.Page({
// 选择发不发通知
onSelectSend
(
event
)
{
if
(
event
.
currentTarget
.
dataset
.
item
.
id
>
-
1
)
{
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'
:
this
.
reSetUsers
()
...
...
@@ -1056,7 +1047,7 @@ create.Page({
endTime
:
this
.
$store
.
data
.
endTime
.
replace
(
/
\/
/g
,
"-"
),
modifyContent
:
'modify_time'
}
this
.
isChange
(
dat2Time1
)
this
.
isChange
(
'modify_time'
,
modifyModel
,
needNotice
)
}
...
...
@@ -1082,6 +1073,7 @@ create.Page({
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
,
"-"
),
...
...
@@ -1111,7 +1103,7 @@ create.Page({
})
}
this
.
modifySchedule
(
data
,
needNotice
)
//
this.modifySchedule(data, needNotice)
})
break
case
'aheadTimes'
:
...
...
@@ -1529,7 +1521,7 @@ create.Page({
})
},
//创建任务
complete
()
{
complete
:
throttle
(
function
()
{
const
{
currentTask
}
=
this
.
store
.
data
;
const
postData
=
{
"groupId"
:
this
.
data
.
scheduleItem
.
groupId
,
...
...
@@ -1562,7 +1554,13 @@ create.Page({
this
.
update
();
}
})
},
}),
// throttle
// complete() {
// debugger
// },
//
expand
()
{
this
.
setData
({
...
...
pages/meetingRoomList/meetingRoomList.js
View file @
1721cd43
import
{
getReserveRoomList
,
getAllScheduleWithMeetingRoomByTime
getAllScheduleWithMeetingRoomByTime
,
getRoomTree
}
from
"../../api/request"
;
import
{
EEXIST
}
from
"constants"
;
import
{
getFormatDate
,
padZero
}
from
"../../utils/utils"
;
import
{
getFlatTree
}
from
'../../utils/flatTree.js'
import
create
from
"dd-store"
;
create
.
Page
({
data
:
{
...
...
@@ -69,8 +71,10 @@ create.Page({
afterTomorrowTime
:
""
,
customTime
:
""
},
userId
:
""
userId
:
""
,
areaMap
:
null
},
parentStr
:
''
,
onLoad
(
query
)
{
// let date = new Date(this.$store.data.startTime.replace(/-/g, "/"));
let
date
=
new
Date
();
...
...
@@ -97,7 +101,13 @@ create.Page({
)}
/
${
padZero
(
afterTomorrowTime
.
getDate
())}
`
,
userId
:
getApp
().
globalData
.
userid
});
getRoomTree
().
then
(
res
=>
{
this
.
setData
({
areaMap
:
getFlatTree
(
res
.
data
.
data
)
})
this
.
getPageData
();
// console.log(this.data.areaMap)
})
},
onShow
()
{
this
.
update
();
...
...
@@ -109,6 +119,10 @@ create.Page({
};
getReserveRoomList
(
data
).
then
(
res
=>
{
if
(
res
.
data
.
data
)
{
for
(
let
value
of
res
.
data
.
data
)
{
value
.
name
=
`
${
this
.
getParentStr
(
"1250241601903665153"
)}${
value
.
name
}
`
this
.
parentStr
=
''
}
let
reserveRoomList
=
res
.
data
.
data
.
map
(
item
=>
{
let
startTime
=
parseInt
(
item
.
timeSlotWithMeetingVOS
[
0
].
reserveStartTime
.
substring
(
0
,
2
)
...
...
@@ -160,6 +174,17 @@ create.Page({
}
});
},
// 获取当前id 的祖先
getParentStr
(
parentId
)
{
if
(
parentId
!==
'0'
)
{
this
.
parentStr
=
this
.
data
.
areaMap
.
get
(
parentId
).
name
+
'-'
+
this
.
parentStr
// 此处一定return
return
this
.
getParentStr
(
this
.
data
.
areaMap
.
get
(
parentId
).
parentId
)
}
else
{
let
parentStr
=
this
.
parentStr
return
parentStr
}
},
// 弹出modal选择会议时间
changeRoomTime
(
e
)
{
let
that
=
this
;
...
...
@@ -1216,15 +1241,11 @@ create.Page({
this
.
$store
.
data
.
roomId
=
this
.
data
.
meetingTime
.
meetingRoomId
;
}
if
(
this
.
$store
.
data
.
originalData
&&
this
.
$store
.
data
.
locationName
)
{
if
(
this
.
$store
.
data
.
locationName
!=
this
.
$store
.
data
.
originalData
.
location
.
locationName
||
this
.
$store
.
data
.
roomId
!=
this
.
$store
.
data
.
originalData
.
meetingRoomId
)
{
(
this
.
$store
.
data
.
updateInfo
=
{
if
((
this
.
$store
.
data
.
locationName
!=
this
.
$store
.
data
.
originalData
.
location
.
locationName
)
||
this
.
$store
.
data
.
roomId
!=
this
.
$store
.
data
.
originalData
.
meetingRoomId
)
{
this
.
$store
.
data
.
updateInfo
=
{
updateType
:
"modify_location"
,
isUpate
:
true
}
),
}
this
.
update
();
}
}
...
...
@@ -1295,8 +1316,8 @@ create.Page({
}
);
},
onMonthChange
()
{},
onYearChange
()
{},
onMonthChange
()
{
},
onYearChange
()
{
},
onSelectHasDisableDate
()
{
my
.
alert
({
content
:
"SelectHasDisableDate"
...
...
pages/outLookContact/outLookContact.js
View file @
1721cd43
...
...
@@ -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
View file @
1721cd43
...
...
@@ -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
})
...
...
pages/scheduleList/scheduleList.js
deleted
100644 → 0
View file @
1a2417e2
This diff is collapsed.
Click to expand it.
stores/exampleStore.js
View file @
1721cd43
...
...
@@ -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
View file @
1721cd43
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
View file @
1721cd43
...
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment