diff --git a/src/apps/AppMeetingNotice/AppMeetingNotice.vue b/src/apps/AppMeetingNotice/AppMeetingNotice.vue
index f4e8f2be..7fc65f18 100644
--- a/src/apps/AppMeetingNotice/AppMeetingNotice.vue
+++ b/src/apps/AppMeetingNotice/AppMeetingNotice.vue
@@ -67,7 +67,7 @@
params: null,
}
},
- onLoad() {
+ created() {
this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter", "meetStatus");
},
computed: {
diff --git a/src/apps/AppMeetingNotice/components/addMeeting.vue b/src/apps/AppMeetingNotice/components/addMeeting.vue
index a561e63c..40173fda 100644
--- a/src/apps/AppMeetingNotice/components/addMeeting.vue
+++ b/src/apps/AppMeetingNotice/components/addMeeting.vue
@@ -72,7 +72,7 @@
发布会议
-
+
@@ -188,29 +188,19 @@
})
},
confirm(e) {
- const date = new Date(e.value);
- const year = date.getFullYear();
- const month = date.getMonth() + 1;
- const day = date.getDate();
- const hours = date.getHours();
- const minutes = date.getMinutes();
- const seconds = date.getSeconds();
- const weekday = date.getDay();
-
- if (new Date().getTime() / 1000 > e.value) return this.$u.toast("选择时间不能小于当前时间")
+ if (new Date().getTime() / 1000 > e.timestamp) return this.$u.toast("选择时间不能小于当前时间")
if (this.index == 0) {
- this.form.startTime = {year,month,day,timestamp:e.vaule}
- this.form.startTime.time = hours + ":" + minutes
- this.form.startTime.weekday = '一二三四五六日'.charAt(weekday)
+ this.form.startTime = {...e}
+ this.form.startTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
+ this.form.startTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
} else {
- if (this.form.startTime.timestamp >= e.value) {
+ if (this.form.startTime.timestamp >= e.timestamp) {
return this.$u.toast("结束时间不能小于开始时间");
}
- this.form.endTime = {year,month,day,timestamp:e.vaule}
- this.form.endTime.time = hours + ":" + minutes
- this.form.endTime.weekday = '一二三四五六日'.charAt(weekday)
+ this.form.endTime = {...e}
+ this.form.endTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
+ this.form.endTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
}
- this.show = false;
},
add(status) {