From ee90b13a47e4f2091f84a80a0731552a04bc51cd Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 22 Aug 2022 15:16:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activivityList/activivityList.vue | 24 +- .../activivityList/addActivity.vue | 62 ++- .../orgActivity/activivityList/addRule.vue | 428 ++++++++++++------ .../activivityList/scheduleForm.vue | 95 +--- .../activivityList/yearplanList.vue | 154 ++++--- 5 files changed, 445 insertions(+), 318 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue index 49b9ed035..ef82a4b33 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue @@ -440,8 +440,8 @@ export default { }, // 字典 async getCategrayList () { - // const url = "/resi/partymember/icPartyAct/acttypelist" - const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist" + const url = "/resi/partymember/icPartyAct/acttypelist" + // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist" let params = {} @@ -486,8 +486,8 @@ export default { async publishActivity () { - // const url = `/resi/partymember/icPartyAct/publish/${this.icPartyActId}`; - const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/publish/${this.icPartyActId}`; + const url = `/resi/partymember/icPartyAct/publish/${this.icPartyActId}`; + // const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/publish/${this.icPartyActId}`; const { data, code, msg } = await requestPost(url, {}); @@ -550,8 +550,8 @@ export default { async cancelActivity () { - // const url = "/resi/partymember/icPartyAct/del"; - const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del"; + const url = "/resi/partymember/icPartyAct/del"; + // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del"; let params = [] params.push(this.icPartyActId) @@ -606,8 +606,8 @@ export default { params.push(element.icPartyActId) }); - // const url = "/resi/partymember/icPartyAct/del"; - const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del"; + const url = "/resi/partymember/icPartyAct/del"; + // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del"; const { data, code, msg } = await requestPost(url, params) @@ -621,8 +621,8 @@ export default { async getTableData () { this.tableLoading = true - // const url = "/resi/partymember/icPartyAct/page-list"; - const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/page-list"; + const url = "/resi/partymember/icPartyAct/page-list"; + // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/page-list"; const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { pageSize, @@ -658,8 +658,8 @@ export default { }, async handleExport () { - // const url = "/resi/partymember/icPartyAct/export-act"; - const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export-act"; + const url = "/resi/partymember/icPartyAct/export-act"; + // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export-act"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index f1daf2f0a..2d9dda8cb 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -15,7 +15,7 @@ placeholder="请选择" clearable class="item_width_1"> - @@ -237,11 +237,11 @@ export default { joinArray: [//参加人员 { - valule: '0', + value: '0', label: '全体党员' }, { - valule: '1', + value: '1', label: '支部委员' }, ], @@ -286,7 +286,7 @@ export default { if (obj) { this.formData.publishPartyOrgId = obj.id//发布活动党组织id this.formData.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称 - this.formData.publishOrgPid = obj.orgPids//发布活动党组织ID的上级节点 + this.formData.publishOrgPid = obj.pid//发布活动党组织ID的上级节点 this.formData.publishOrgType = obj.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 this.formData.publishOrgPath = value.join(',')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 } else { @@ -300,7 +300,8 @@ export default { handleChangeJoinOrg (value) { console.log('value', value) - this.formData.serviceScope = [] + console.log('joinIdArray', this.joinIdArray) + this.formData.joinOrgList = [] let selArray = this.$refs["myCascader_join"].getCheckedNodes() console.log('selArray', selArray) @@ -308,12 +309,12 @@ export default { selArray.forEach((element, index) => { let obj = { - joinOrgId: element.id, - orgType: element.partyOrgType, - pid: element.pid, - joinOrgPath: value[index].join(','), + joinOrgId: element.data.id, + orgType: element.data.partyOrgType, + pid: element.data.pid, + joinOrgPath: element.path.join(','), } - this.formData.serviceScope.push(obj) + this.formData.joinOrgList.push(obj) }); }, @@ -326,14 +327,11 @@ export default { }, 10000) this.$refs['ref_form'].validate((valid, messageObj) => { if (!valid) { - app.util.validateRule(messageObj) + // app.util.validateRule(messageObj) this.btnDisable = false } else { - - this.addActivity() - } }) @@ -353,8 +351,8 @@ export default { this.formData.icPartyActId = '' } console.log(this.formData) - // const url = '/resi/partymember/icPartyAct/addOrUpdate' - const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/addOrUpdate' + const url = '/resi/partymember/icPartyAct/addOrUpdate' + // const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/addOrUpdate' let params = { ...this.formData @@ -363,17 +361,17 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.$message.success('操作成功') - this.resetData() - this.$emit('handleOk') + // this.$message.success('操作成功') + // this.resetData() + // this.$emit('handleOk') } else { this.$message.error(msg) } }, async loadInfo () { - // const url = `/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`; - const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`; + const url = `/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`; + // const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`; let params = {} @@ -391,8 +389,8 @@ export default { // 活动类型 async getCategrayList () { - // const url = "/resi/partymember/icPartyAct/acttypelist" - const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist" + const url = "/resi/partymember/icPartyAct/acttypelist" + // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist" let params = {} @@ -507,21 +505,23 @@ export default { const mp3Array = ['mp3'] if (picArray.indexOf(fileType) > -1) { - file.attachmentFormat = 'image' + file.format = 'image' } else if (videoarray.indexOf(fileType) > -1) { - file.attachmentFormat = 'video' + file.format = 'video' } else if (docArray.indexOf(fileType) > -1) { - file.attachmentFormat = 'doc' + file.format = 'doc' } else if (mp3Array.indexOf(fileType) > -1) { - file.attachmentFormat = 'voice' + file.format = 'voice' } file.url = res.data.url file.type = fileType - file.attachmentName = file.name - file.attachmentType = file.type - file.attachmentUrl = file.url + // file.attachmentName = file.name + // file.attachmentType = file.type + // file.attachmentUrl = file.url + file.format = file.attachmentFormat + this.fileList.push(file) console.log(this.fileList) @@ -617,7 +617,6 @@ export default { }, props: { - formType: { //表单操作类型 add新增，edit编辑，detail详情 type: String, required: '' @@ -627,7 +626,6 @@ export default { required: '' }, - } } diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue index 3f127f111..64b190021 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue @@ -27,7 +27,7 @@
活动举办频次 - 每季度一次 + {{selActType.frequencyDesc?selActType.frequencyDesc:'--'}}
@@ -47,14 +47,14 @@ width="50"> -