diff --git a/src/apps/AppMeetingNotice/AppMeetingNotice.vue b/src/apps/AppMeetingNotice/AppMeetingNotice.vue index 018be0c5..aa6e5a84 100644 --- a/src/apps/AppMeetingNotice/AppMeetingNotice.vue +++ b/src/apps/AppMeetingNotice/AppMeetingNotice.vue @@ -112,20 +112,17 @@ }) }, handleClick(index) { - let url + this.params = index; + this.isList = false; if (index == 0 || index == 2) { this.comp = "meetingList"; - this.params = index; - this.isList = false; } else if (index == 1) { - url = "/pages/meetingNotice/components/belongToMe" + this.comp = "belongToMe"; } - uni.navigateTo({url}) }, add() { - uni.navigateTo({ - url: "/pages/meetingNotice/components/addMeeting" - }) + this.isList = false; + this.comp = "addMeeting"; } }, @@ -142,6 +139,7 @@ }, onShow() { + this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter"); this.getData() } } diff --git a/src/apps/AppMeetingNotice/components/addMeeting.vue b/src/apps/AppMeetingNotice/components/addMeeting.vue index d2d6fe3a..e9571201 100644 --- a/src/apps/AppMeetingNotice/components/addMeeting.vue +++ b/src/apps/AppMeetingNotice/components/addMeeting.vue @@ -29,7 +29,8 @@
- +
@@ -71,9 +72,10 @@
发布会议
- + - + @@ -84,7 +86,7 @@ export default { name: "addMeeting", - components: {AiBack,AiSelectEnterprise,AiUploader}, + components: {AiBack, AiSelectEnterprise, AiUploader}, data() { const initTime = { time: "", @@ -111,19 +113,19 @@ files: [], }, userSelect: false, + value: Number(new Date()) } }, onLoad(opt) { - if(opt.id) { + if (opt.id) { this.form.id = opt.id this.getDetail() } - this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter"); - this.$nextTick(()=>{ + this.$nextTick(() => { let date = new Date(); this.form.startTime.time = date.getHours()?.toString()?.padStart(2, "0") + ":" + date.getMinutes()?.toString()?.padStart(2, "0") this.form.startTime.year = date.getFullYear() - this.form.startTime.month = (date.getMonth()+1)?.toString()?.padStart(2, "0") + this.form.startTime.month = (date.getMonth() + 1)?.toString()?.padStart(2, "0") this.form.startTime.day = date.getDate() this.form.startTime.weekday = '日一二三四五六'.charAt(date.getDay()) this.form.endTime = {...this.form.startTime} @@ -142,10 +144,10 @@ } }, methods: { - fileList(e){ + fileList(e) { this.form.files = e }, - change(e){ + change(e) { this.form.attendees = e }, beforeNoticeChange(e) { @@ -155,12 +157,12 @@ this.form.noticeAfter = e.detail.value }, - getDetail(){ - this.$http.post("/app/appmeetinginfo/info-id",null,{ - params:{ - id:this.form.id + getDetail() { + this.$http.post("/app/appmeetinginfo/info-id", null, { + params: { + id: this.form.id } - }).then(res=>{ + }).then(res => { if (res && res.data) { this.form.title = res.data.title this.form.address = res.data.address @@ -186,23 +188,33 @@ }) }, confirm(e) { - if (new Date().getTime() / 1000 > e.timestamp) return this.$u.toast("选择时间不能小于当前时间") + 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 (this.index == 0) { - 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()) + this.form.startTime = {year,month,day,timestamp:e.vaule} + this.form.startTime.time = hours + ":" + minutes + this.form.startTime.weekday = '一二三四五六日'.charAt(weekday) } else { - if (this.form.startTime.timestamp >= e.timestamp) { + if (this.form.startTime.timestamp >= e.value) { return this.$u.toast("结束时间不能小于开始时间"); } - 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.form.endTime = {year,month,day,timestamp:e.vaule} + this.form.endTime.time = hours + ":" + minutes + this.form.endTime.weekday = '一二三四五六日'.charAt(weekday) } + this.show = false; }, add(status) { - if(status==1){ + if (status == 1) { if (!this.form.title) return this.$u.toast("请输入会议标题") if (this.form.startTime.timestamp >= this.form.endTime.timestamp) return this.$u.toast("结束时间不能小于开始时间") @@ -211,12 +223,12 @@ if (!this.form.content) return this.$u.toast("请输入会议内容") - if(!this.form.attendees.length) return this.$u.toast("请选择参会人") + if (!this.form.attendees.length) return this.$u.toast("请选择参会人") } this.$http.post("/app/appmeetinginfo/add-update", { ...this.form, - files:this.form.files.map(e=>e.id), + files: this.form.files.map(e => e.id), status, startTime: this.form.startTime.year + "-" + this.form.startTime.month + "-" + this.form.startTime.day + " " + this.form.startTime.time + ":00", endTime: this.form.endTime.year + "-" + this.form.endTime.month + "-" + this.form.endTime.day + " " + this.form.endTime.time + ":00", diff --git a/src/apps/AppMeetingNotice/components/belongToMe.vue b/src/apps/AppMeetingNotice/components/belongToMe.vue index eb54beb7..c1aa9648 100644 --- a/src/apps/AppMeetingNotice/components/belongToMe.vue +++ b/src/apps/AppMeetingNotice/components/belongToMe.vue @@ -1,7 +1,7 @@