Merge branch 'dev-20220218' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-20220218

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;

src/views/modules/communityParty/regionalParty/activitysForm.vue

@@ -11,7 +11,7 @@
 
         <el-form-item label="服务事项"
                       label-width="150px"
-                      prop="serviceMatter">
+                      prop="serviceMatterList">
 
           <el-checkbox-group class="item_width_1"
                              style="display:flex;flex-wrap:wrap"
@@ -36,12 +36,12 @@
         </el-form-item>
 
         <el-form-item label="单位名称"
-                      prop="unitId"
+                      prop="unitIdList"
                       label-width="150px"
                       style="display: block">
           <el-checkbox-group class="item_width_1"
                              style="display:flex;flex-wrap:wrap"
-                             v-model="formData.unitList">
+                             v-model="formData.unitIdList">
             <el-checkbox v-for="item in unitList"
                          :key="item.value"
                          :label="item.value">{{item.label}}</el-checkbox>
@@ -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: [

src/views/modules/visual/basicinfo/basicInfoMain.vue

@@ -16,7 +16,7 @@
 
     <!-- 组织列表 -->
 
-    <div v-show="orgLevel!=='neighborHood'"
+    <div v-show="orgLevel!=='people' && orgLevel!=='search' && orgLevel!=='neighborHood'"
          class="div_agency_list">
       <el-scrollbar style="height:98%"
                     wrap-style="overflow-x:hidden">

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;

src/views/modules/visual/communityParty/dialogInfo.vue

@@ -19,11 +19,11 @@
             </div> -->
             <div class="item">
               <span class="item-field">服务事项：</span>
-              <span>{{ info.serviceMatterName }}</span>
+              <span>{{ info.serviceMatterNameShow }}</span>
             </div>
             <div class="item">
               <span class="item-field">单位名称：</span>
-              <span>{{ info.unitName }}</span>
+              <span>{{ info.unitNameShow }}</span>
             </div>
             <div class="item">
               <span class="item-field">活动标题：</span>