diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 2426483c..5729b473 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -380,7 +380,7 @@ } .div_agency_list { - z-index: 9999; + z-index: 1000; position: absolute; top: 50px; right: 600px; diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 57a6575e..04312f90 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -11,7 +11,7 @@ + prop="serviceMatterList"> + v-model="formData.unitIdList"> {{item.label}} @@ -225,10 +225,9 @@ export default { activityId: '', formData: { serviceMatter: '',//服务事项 - serviceMatterList: [], unitId: '',//单位ID - unitList: [], + unitIdList: [], title: '',//活动标题 target: '',//活动目标 content: '',//活动内容 @@ -480,7 +479,7 @@ export default { serviceMatter: '',//服务事项 serviceMatterList: [], unitId: '',//单位ID - unitList: [], + unitIdList: [], title: '',//活动标题 target: '',//活动目标 content: '',//活动内容 @@ -511,10 +510,10 @@ export default { computed: { dataRule () { return { - serviceMatter: [ + serviceMatterList: [ { required: true, message: '服务事项不能为空', trigger: 'blur' } ], - unitId: [ + unitIdList: [ { required: true, message: '单位名称不能为空', trigger: 'blur' }, ], title: [ diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 18b13ef6..d5dc1da0 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -16,7 +16,7 @@ -
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index bbfb1970..816af10f 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -143,8 +143,8 @@ export default { warningList: [], headerList: [ { title: "序号", coulmn: 'index' }, - { title: "区域化党建单位名称", coulmn: 'unitName' }, { title: "活动标题", coulmn: 'title' }, + { title: "单位名称", coulmn: 'unitName' }, { title: "活动地址", coulmn: 'address' }, { title: "服务事项", coulmn: 'serviceMatterName' }, { title: "服务人数", coulmn: 'peopleCount' }, @@ -388,6 +388,8 @@ export default { if (code === 0) { this.detailInfo = data + this.detailInfo.serviceMatterNameShow = data.serviceMatterNameList.join(',') + this.detailInfo.unitNameShow = data.unitNameList.join(',') } else { this.$message.error(msg) } @@ -756,6 +758,10 @@ export default { } .box-right { flex: 1; + overflow: hidden; + .pagination { + margin-top: 0; + } .box-map { height: 400px; // border: 1px solid #2865fa; diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue index 4a521290..60db4c68 100644 --- a/src/views/modules/visual/communityParty/dialogInfo.vue +++ b/src/views/modules/visual/communityParty/dialogInfo.vue @@ -19,11 +19,11 @@
-->
服务事项: - {{ info.serviceMatterName }} + {{ info.serviceMatterNameShow }}
单位名称: - {{ info.unitName }} + {{ info.unitNameShow }}
活动标题: