From a566e4a11452aa12ad56a06bdf99a6de40c92d59 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 14:08:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/orgActivity/activivityList/addRule.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue index 727301384..3f58b0cf8 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue @@ -544,7 +544,7 @@ export default { publishOrgPid: this.defaultPublishParty.defaultPartyOrgPid,// 参加活动党组织ID的上级节点 publishOrgType: this.defaultPublishParty.orgType,//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 publishOrgPathShow: this.defaultPublishParty.defaultPartyOrgPath,//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 - joinUserType: this.joinArray[0].value ||'',//参加人员类型，0：全体党员；1：支部委员 默认 全体 + joinUserType: this.joinArray[1].value ||'',//参加人员类型，0：全体党员；1：支部委员 默认 全体 isAutoInform: '',// 是否自动通知参加人员，0否；1是 introduce: '',// 活动介绍 attachmentList: [], From 2952f711852c07f43f218578f5b622f2323077e4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 14:33:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/orgActivity/activivityList/addRule.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue index 3f58b0cf8..3a0c02852 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue @@ -60,6 +60,7 @@ format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd hh:mm:ss" type="datetime" + :default-value="yearId" default-time="09:00:00" placeholder="选择日期"> @@ -292,7 +293,6 @@ export default { await this.getCategrayList() await this.getAutoTimeArray() await this.getDefaultPublishParty() - }, methods: { From f67b8a1f648965a2dcfe3bef58178d33447170bf Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 2 Sep 2022 14:44:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/calendar/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index d703f51fe..eb41c9c0e 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -364,6 +364,7 @@ export default { console.log("orgId", val); this.getCurrentDateData(); this.getRangeData(); + this.getMonthData(); }, "fmData.isSelf": function (val) { console.log("isSelf", val); From 233d05d72ab4da49a54947a09c9049ffd5df72b5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 2 Sep 2022 15:01:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=AC=E4=BA=BA=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/calendar/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index eb41c9c0e..df64d6e1d 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -370,6 +370,7 @@ export default { console.log("isSelf", val); this.getCurrentDateData(); this.getRangeData(); + this.getMonthData(); }, currentYear: function (val) { console.log("watch--currentYear", val); From 3339a0c85310d79606870e1e8f8f63f6765fbba7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 15:15:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?bug=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activivityList/addActivity.vue | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index f78ec5ce3..659d50320 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -220,7 +220,7 @@ export default { actType: '',// 活动类型，来源于活动类型接口value holdYearId: '',//活动开始时间所属年份：yyyy holdMonthId: '',//活动开始时间所属月份：yyyyMM - holdTime: new Date(),//活动开始时间：yyyy-MM-dd HH:mm:ss + holdTime: this.getFormatDate(),//活动开始时间：yyyy-MM-dd HH:mm:ss topic: '',// 活动主题 address: '',// 活动地址 latitude: '',//活动地点纬度 @@ -288,7 +288,20 @@ export default { }, methods: { - + getFormatDate() { + var date = new Date(); + var month = date.getMonth() + 1; + var strDate = date.getDate(); + if (month >= 1 && month <= 9) { + month = "0" + month; + } + if (strDate >= 0 && strDate <= 9) { + strDate = "0" + strDate; + } + var currentDate = date.getFullYear() + "-" + month + "-" + strDate + + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); + return currentDate; + }, handleChangeScope (value) { let obj = this.$refs["myCascader"].getCheckedNodes()[0].data @@ -358,7 +371,9 @@ export default { this.formData.isAutoInform = '0' } this.formData.attachmentList = [...this.fileList] - + let array = this.formData.holdTime.split('-') + this.formData.holdYearId = array[0] + this.formData.holdMonthId = array[0] + array[1] if (this.formType === 'add') { this.formData.icPartyActId = '' From 7ebcebd98a2d0aa8b07620678dc614651adb336b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 15:35:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8A=E5=8D=88=E4=B9=9D=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/orgActivity/activivityList/addActivity.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index 659d50320..acf077b85 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -299,7 +299,7 @@ export default { strDate = "0" + strDate; } var currentDate = date.getFullYear() + "-" + month + "-" + strDate - + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); + + " " + '09:00:00'; return currentDate; }, handleChangeScope (value) {