diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js index ebde6a3ee..d8f48fa0b 100644 --- a/src/mixins/view-module.js +++ b/src/mixins/view-module.js @@ -42,18 +42,17 @@ export default { methods: { // 获取数据列表 query () { - this.dataListLoading = true - this.$http.get( + const params = { + order: this.order, + orderField: this.orderField, + page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null, + limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null, + ...this.dataForm + } + this.post = true + this.$http.post( this.mixinViewModuleOptions.getDataListURL, - { - params: { - order: this.order, - orderField: this.orderField, - page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null, - limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null, - ...this.dataForm - } - } + params ).then(({ data: res }) => { this.dataListLoading = false if (res.code !== 0) { diff --git a/src/views/modules/communityParty/members/cpts/points.vue b/src/views/modules/communityParty/members/cpts/points.vue index 11ee93f53..258dd1b2d 100644 --- a/src/views/modules/communityParty/members/cpts/points.vue +++ b/src/views/modules/communityParty/members/cpts/points.vue @@ -4,7 +4,8 @@ - +
+
@@ -39,6 +40,7 @@
+
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue index be049deeb..ff99cfb9b 100644 --- a/src/views/modules/partymember/icpartymemberpoint.vue +++ b/src/views/modules/partymember/icpartymemberpoint.vue @@ -1,228 +1,339 @@ diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue index f50facc00..db6d95418 100644 --- a/src/views/modules/visual/communityParty/dialogInfo.vue +++ b/src/views/modules/visual/communityParty/dialogInfo.vue @@ -29,6 +29,11 @@ 活动标题: {{ info.title }} +
+ 活动目标: + {{ info.target }} +
+
活动内容: diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index 6b6aa616d..180fc9382 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -445,7 +445,7 @@ export default { const url = "/gov/org/agency/maporg" let params = { orgId: this.orgId, - level: this.orgLevel + level: this.orgType } const { data, code, msg } = await requestPost(url, params) @@ -454,7 +454,7 @@ export default { this.orgData = data this.orgId = this.orgData.id - this.orgLevel = this.orgData.level + this.orgType = this.orgData.level this.parentPolygon = [] this.parentPolygon = data.children.map(item => { return { diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index 6b40e92c4..b5b0e541a 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -815,8 +815,11 @@ export default { }, handleClickRow(val) { console.log('click-row----', val) + if (!val.icResiUser) { + return this.$message.warning('该党员居民信息未完善') + } this.$router.push({ - path: `/main-shuju/visual-basicinfo-people/${val.userId}`, + path: `/main-shuju/visual-basicinfo-people/${val.icResiUser}`, }); }, handleCascader(val) { diff --git a/src/views/modules/visual/communityParty/unitInfo.vue b/src/views/modules/visual/communityParty/unitInfo.vue index 8ee4c9ea3..4e3c7c97e 100644 --- a/src/views/modules/visual/communityParty/unitInfo.vue +++ b/src/views/modules/visual/communityParty/unitInfo.vue @@ -41,6 +41,10 @@ 活动标题: {{ info.title }}
+
+ 活动目标: + {{ info.target }} +
活动内容: