From f67b8a1f648965a2dcfe3bef58178d33447170bf Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 2 Sep 2022 14:44:47 +0800 Subject: [PATCH 1/8] =?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 2/8] =?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 3/8] =?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 4/8] =?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) { From 851c737deb096c75c7866d89a9a72579af71c653 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 2 Sep 2022 16:06:23 +0800 Subject: [PATCH 5/8] 11 --- .../activivityList/addActivity.vue | 50 +++++++++++++++++++ .../orgActivity/activivityList/addRule.vue | 29 ++++++++++- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index f78ec5ce3..18ef43c3b 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -311,6 +311,8 @@ export default { handleChangeJoinOrg (value) { console.log('value', value) console.log('joinIdArray', this.formData.joinIdArray) + this.formData.joinIdArray = [] + this.formData.joinIdArray = value this.formData.joinOrgList = [] let selArray = this.$refs["myCascader_join"].getCheckedNodes() @@ -395,6 +397,14 @@ export default { this.formData.publichIdArray = [] if (data.publishOrgPathShow) { this.formData.publichIdArray = data.publishOrgPathShow.split(':') + } else { + let array = data.publishOrgPath.split(':') + array.forEach(element => { + if (this.isInTree(element)) { + this.formData.publichIdArray.push(element) + } + + }); } this.formData.joinIdArray = [] @@ -402,12 +412,25 @@ export default { data.joinOrgList.forEach(element => { if (element.joinOrgPathShow) { this.formData.joinIdArray.push(element.joinOrgPathShow.split(':')) + } else { + let array = element.joinOrgPath.split(':') + let joinIdTemp = [] + array.forEach(element => { + if (this.isInTree(element)) { + joinIdTemp.push(element) + } + + }); + + this.formData.joinIdArray.push(joinIdTemp) } this.formData.joinNames = this.formData.joinNames + element.joinOrgName + ',' }); + console.log('info-joinIdArray', this.formData.joinIdArray) + if (this.formData.joinNames) { this.formData.joinNames = this.formData.joinNames.substring(0, this.formData.joinNames.length - 1) } @@ -420,6 +443,33 @@ export default { } }, + //剔除树上没有的id + isInTree (id) { + let inTree = false + const fn = (obj) => { + if (Array.isArray(obj)) { + + + obj.forEach((item) => { + // + if (item.id === id) { + inTree = true + } else { + + } + + fn(item.children); + }); + + } + + + }; + fn(this.publishOptions); + return inTree + + }, + // 活动类型 async getCategrayList () { const url = "/resi/partymember/icPartyAct/acttypelist" diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue index 727301384..92617f51c 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue @@ -299,6 +299,21 @@ export default { handleChangeScope (index) { + let obj = this.$refs["myCascader" + index].getCheckedNodes()[0].data + + // if (obj) { + // this.tableData[index].publishPartyOrgId = obj.id//发布活动党组织id + // this.tableData[index].publishPartyOrgName = obj.partyOrgName//发布活动党组织名称 + // this.tableData[index].publishOrgPid = obj.pid//发布活动党组织ID的上级节点 + // this.tableData[index].publishOrgType = obj.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + // this.tableData[index].publishOrgPathShow = value.join(':')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + // } else { + // this.tableData[index].publishPartyOrgId = '' + // this.tableData[index].publishPartyOrgName = '' + // this.tableData[index].publishOrgPid = '' + // this.tableData[index].publishOrgType = '' + // this.tableData[index].publishOrgPathShow = '' + // } }, handleChangeJoinOrg (value, index) { @@ -426,6 +441,16 @@ export default { disposeParty () { this.tableData.forEach((tableItem, index) => { + + let obj = this.$refs["myCascader" + index].getCheckedNodes()[0] + + //发布活动党组织 + tableItem.publishPartyOrgId = obj.data.id//发布活动党组织id + tableItem.publishPartyOrgName = obj.data.partyOrgName//发布活动党组织名称 + tableItem.publishOrgPid = obj.data.pid//发布活动党组织ID的上级节点 + tableItem.publishOrgType = obj.data.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + tableItem.publishOrgPathShow = obj.path.join(':')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + //参会党组织 tableItem.joinOrgList = [] let selJoinArray = this.$refs["myCascader_join" + index].getCheckedNodes() @@ -538,13 +563,13 @@ export default { address: '',// 活动地址 latitude: '',//活动地点纬度 longitude: '',// 活动地点经度 - autoPublicType: this.autoTimeArray[1].value ||'',//自动发布时间key; 来源于字典表接口 默认 3天 + autoPublicType: this.autoTimeArray[1].value || '',//自动发布时间key; 来源于字典表接口 默认 3天 publishPartyOrgId: this.defaultPublishParty.defaultPartyOrgId,// 发布活动党组织id publishPartyOrgName: this.defaultPublishParty.defaultPartyOrgName,// 发布活动党组织名称 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[0].value || '',//参加人员类型，0：全体党员；1：支部委员 默认 全体 isAutoInform: '',// 是否自动通知参加人员，0否；1是 introduce: '',// 活动介绍 attachmentList: [], From 3ec33be54b4becd08a6af65d635fb9ee06c16fbb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 15:35:27 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/calendar/index.vue | 8 ++++++++ .../orgActivity/activivityList/addActivity.vue | 2 +- .../orgActivity/activivityList/scheduleForm.vue | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index df64d6e1d..223fcd88f 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -84,6 +84,10 @@ 提醒时间： {{ item.remindTime }} +
+ 日程时间： + {{ item.happenedTime }} +
备注说明： {{ item.remark }} @@ -216,6 +220,10 @@ 提醒时间： {{ item.remindTime }}
+
+ 日程时间： + {{ item.happenedTime }} +
备注说明： {{ item.remark }} 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) { diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue index ad1f5c561..dc04a5b22 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue @@ -22,6 +22,16 @@ prop="remindTime" label-width="150px"> + + + + Date: Fri, 2 Sep 2022 16:19:59 +0800 Subject: [PATCH 7/8] ai --- .../activivityList/scheduleForm.vue | 14 ++++++++++- .../activivityList/scheduleList.vue | 24 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue index dc04a5b22..793a4e8ec 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue @@ -31,6 +31,18 @@ style="display: block" prop="happenedTime" label-width="150px"> + + + + +
- + + + @@ -225,6 +232,17 @@ prop="remindTime" label-width="150px"> + + + + Date: Fri, 2 Sep 2022 16:23:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/orgActivity/activivityList/scheduleForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue index dc04a5b22..5a277b46b 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue @@ -100,7 +100,7 @@ export default { formData: { title: '',// remindTime: '',// - happenedTime:'', + happenedTime:new Date(), isPublic: '',// remark: '',// scheduleId: '',