Skip to content

S
schedule
Commit f5f88d00 by fengzhaoyu
Options

修改首页传参数

parent 0d665535
Showing with 49 additions and 35 deletions
PageComponents/scheduleList/scheduleList.js
......@@ -117,10 +117,10 @@ Component({
);
});
},
didUpdate() {},
didUnmount() {},
didUpdate() { },
didUnmount() { },
methods: {
nextDetail: throttle(function(e) {
nextDetail: throttle(function (e) {
let item = e.target.dataset.item;
dd.navigateTo({
url: `./../editMeeting/editMeeting?scheduleItem=${JSON.stringify(item)}`
......@@ -185,16 +185,9 @@ Component({
);
rule.all().map(item2 => {
let excludeDate = getFormatDate(item2, "yyyyMMdd");
let hasExclude =
excludeDateList.scheduleList.indexOf(excludeDate) === -1;
if (
new Date(item2).getTime() < excludeDateList.templateList &&
hasExclude
) {
let startTime =
getFormatDate(item2, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime;
let hasExclude = excludeDateList.scheduleList.indexOf(excludeDate) === -1;
if (new Date(item2).getTime() < excludeDateList.templateList && hasExclude) {
let startTime = getFormatDate(item2, "yyyyMMdd") + " " + item.recurrenceModel.startTime;
let endTime = new Date(startTime);
endTime.setMinutes(
endTime.getMinutes() + item.recurrenceModel.duration
......@@ -204,11 +197,11 @@ Component({
{
confirmAttendance: item.confirmAttendance,
endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"),
id: item.id,
scheduleTemplateId: item.scheduleTemplateId,
// id: item.id,
scheduleTemplateId: item.id,
startTime: startTime,
title: item.title,
planDate: getFormatDate(item2, "yyyyMMdd")
planDate: getFormatDate(item2, "yyyyMMdd", '-')
}
);
}
......@@ -221,8 +214,8 @@ Component({
item.recurrenceModel.startTime;
let endTime = new Date(
getFormatDate(item2, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime
" " +
item.recurrenceModel.startTime
);
endTime.setMinutes(
endTime.getMinutes() + item.recurrenceModel.duration
......@@ -232,11 +225,10 @@ Component({
{
confirmAttendance: item.confirmAttendance,
endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"),
id: item.id,
scheduleTemplateId: item.scheduleTemplateId,
scheduleTemplateId: item.id,
startTime: startTime,
title: item.title,
planDate: getFormatDate(item2, "yyyyMMdd")
planDate: getFormatDate(item2, "yyyyMMdd", '-')
}
);
});
......@@ -258,7 +250,7 @@ Component({
);
}
});
scheduleMap.forEach(function(value, key, map) {
scheduleMap.forEach(function (value, key, map) {
scheduleList.push(value);
});
return scheduleList;
......@@ -340,9 +332,9 @@ Component({
thisDayEndTime: AllScheduleList[y].endTime.slice(11, 16),
isBeOverdue:
new Date().getTime() >
new Date(
AllScheduleList[y].endTime.replace(/-/g, "/")
).getTime()
new Date(
AllScheduleList[y].endTime.replace(/-/g, "/")
).getTime()
? true
: false
});
......@@ -377,9 +369,9 @@ Component({
duration: count + 1,
isBeOverdue:
new Date().getTime() >
new Date(
AllScheduleList[y].endTime.replace(/-/g, "/")
).getTime()
new Date(
AllScheduleList[y].endTime.replace(/-/g, "/")
).getTime()
? true
: false
});
......@@ -396,7 +388,7 @@ Component({
value: year
});
let thisDay = new Date().toLocaleDateString();
DateMap.forEach(function(value, key, map) {
DateMap.forEach(function (value, key, map) {
if (
new Date(key).getDay() === 0 &&
that.count(
......@@ -422,7 +414,7 @@ Component({
type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`,
}${rangeDay2}日`,
dayStr: key
});
}
......@@ -438,7 +430,7 @@ Component({
type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`,
}${rangeDay2}日`,
dayStr: key
});
}
......@@ -460,7 +452,7 @@ Component({
type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`,
}${rangeDay2}日`,
dayStr: key
});
}
......
pages/editMeeting/editMeeting.acss
......@@ -50,6 +50,9 @@ input {
.createTitle {
padding: 14rpx 36rpx 16rpx;
position: relative;
min-height: 90rpx;
overflow: hidden;
}
.title {
......@@ -84,12 +87,17 @@ input {
font-family: PingFangSC-Medium;
font-size: 40rpx;
color: #1B263D;
position: relative;
}
.remark .placeholder {
font-size: 28rpx
}
.meetingWay {
position: relative;
}
.place, .time, .participator, .meetingWay {
display: flex;
padding: 0 36rpx;
......@@ -370,4 +378,14 @@ input {
.footNavTop .devider {
margin: 0;
}
.permissions {
background: rgba(0, 0, 0, 0);
position: fixed;
top: 0;
z-index: 10;
height: 100%;
width: 100%;
background: red;
}
\ No newline at end of file
pages/editMeeting/editMeeting.js
......@@ -139,7 +139,7 @@ create.Page({
let data = {
id: this.data.scheduleItem.id,
scheduleTemplateId: this.data.scheduleItem.scheduleTemplateId,
planDate: this.data.scheduleItem.planDate
planDate: this.data.scheduleItem.planDate.replace(/\//g, '-')
}
getScheduleDetail(data).then(res => {
if (res.data.code === 0) {
......@@ -152,6 +152,9 @@ create.Page({
participatorUserId.push(value.participator.userId)
originUsers.push(value.participator)
if (value.participator.userId === getApp().globalData.userid) {
// this.setData({
// aheadTimes: value.
// })
}
}
......
pages/participantsDetail/participantsDetail.js
......@@ -181,8 +181,8 @@ create.Page({
'centerPopup.showCenterPopup': false
})
if (event.currentTarget.dataset.item.id > -1) {
let addUserList = _that.arrayPoor(_that.store.data.originUsers, _that.store.data.participatorList).addUserList
let deleteUserList = _that.arrayPoor(_that.store.data.originUsers, _that.store.data.participatorList).deleteUserList
let addUserList = this.arrayPoor(this.store.data.originUsers, this.store.data.participatorList).addUserList
let deleteUserList = this.arrayPoor(this.store.data.originUsers, this.store.data.participatorList).deleteUserList
let dataUser = {
addUserList: addUserList,
deleteUserList: deleteUserList,
......
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