Merge branch 'V4.3.3' of http://120.46.222.128:10021/elink-star/epmet-work-pc into V4.3.3_XiaoWang

src/assets/scss/pages/resiAdd.scss

@@ -52,18 +52,18 @@ h5 {
      color:#ff5107 ;
     }
 }
-.font-color-blue{
-    ::v-deep .el-form-item__label{
-     color:#3876f2;
-     position: relative;
-     &::before{
-        content: '*';
-        position: absolute;
-        top: 0px;
-        left: 16px;
-     }
-    }
-}
+// .font-color-blue{
+//     ::v-deep .el-form-item__label{
+//      color:#3876f2;
+//      position: relative;
+//      &::before{
+//         content: '*';
+//         position: absolute;
+//         top: 0px;
+//         left: 16px;
+//      }
+//     }
+// }
 .font-color-blue2{
     ::v-deep .el-form-item__label{
      &::before{

src/components/GridTree/nodeWrap.vue

@@ -263,16 +263,19 @@ export default {
     @include lastLevel;
     background-image: url(~@/assets/images/home/gridGreen.png);
     background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
   .dyzxhRed {
     @include lastLevel;
     background-image: url(~@/assets/images/home/gridRed.png);
     background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
   .dyzxhYellow {
     @include lastLevel;
     background-image: url(~@/assets/images/home/gridYellow.png);
     background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
   .lxjt {
     @include spanLevel;

src/utils/desensitization.js

@@ -1,6 +1,6 @@
 export default function desensitizeSubstring(inputString, start, end) {
-    if (!inputString) {
-        return ''
+    if (!inputString||inputString.length<11) {
+        return '--'
     }
     if (end >= inputString.length) {
         end = inputString.length - 1

src/views/components/addResi.vue

@@ -162,7 +162,6 @@
                                 </el-button>
                                </div>
                                <div  class="flex_box">
-
                                 <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
                                     <el-select v-model.trim="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择"
                                         size="small" class="list_item_width_1"
@@ -611,7 +610,7 @@ export default {
                         },
                         {
                             label: "高龄补助",
-                            check:'fourFont',
+                            // check:'fourFont',
                             itemType: "inputNum",
                             formName: "oldSubsidy",
                         },
@@ -866,7 +865,7 @@ export default {
                         },
                         {//2
                             label: "子女性别",
-                            check:'fourFont',
+                            // check:'fourFont',
                             itemType: "select1",
                             formName: "childGender",
                             opction: [
@@ -882,7 +881,7 @@ export default {
                         },
                         {
                             label: "子女死亡日期",
-                            check:'sixFont',
+                            // check:'sixFont',
                             itemType: "datepicker1",
                             formName: "certificateDate",
                             opction: [],
@@ -898,7 +897,7 @@ export default {
                         },
                         {
                             label: "子女伤残等级",
-                            check:'sixFont',
+                            // check:'sixFont',
                             itemType: "select1",
                             formName: "childDisabilityLevel",
                             opctionUrl: 'sys/dict/data/dictlist',

src/views/components/editResi.vue

@@ -1129,7 +1129,7 @@ export default {
               label: "高龄补助",
               itemType: "inputNum",
               formName: "oldSubsidy",
-              check:'fourFont',
+              // check:'fourFont',
               pformName: "oldPeopleDto",
             },
           ],
@@ -1406,7 +1406,6 @@ export default {
               //2
               label: "子女性别",
               itemType: "select1",
-              check:'fourFont',
               formName: "childGender",
               pformName: "specialSupportDto",
               opction: [
@@ -1423,7 +1422,6 @@ export default {
             {
               label: "子女死亡日期",
               itemType: "datepicker1",
-              check:'sixFont',
               formName: "childDeathDate",
               pformName: "specialSupportDto",
               opction: [],
@@ -1431,7 +1429,6 @@ export default {
             {
               label: "子女伤残类别",
               itemType: "select1",
-              check:'sixFont',
               formName: "childDisabilityCategoryCode",
               opctionUrl: "sys/dict/data/dictlist",
               pformName: "specialSupportDto",
@@ -1441,7 +1438,6 @@ export default {
             {
               label: "子女伤残等级",
               itemType: "select1",
-              check:'sixFont',
               pformName: "specialSupportDto",
               formName: "childDisabilityLevel",
               opctionUrl: "sys/dict/data/dictlist",

src/views/components/resiExpand/index.vue

@@ -17,7 +17,7 @@
                             <el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`"
                                 size="small" :multiple="itemk.multiple" :collapse-tags="itemk.collapseTags" clearable
                                 :style="{ 'width': itemk.formName == 'specialCategoryCode' ? '183px' : '' }"
-                                class="list_item_width_1">
+                                class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)">
                                 <el-option v-for="items in itemk.opction" :key="items.value" :label="items.label"
                                     :value="items.value">
                                 </el-option>
@@ -206,6 +206,15 @@ export default {
     mounted() {
     },
     methods: {
+        handelChangeSelsect(pname,cname){
+            if(pname === 'specialSupportDto' && cname === 'specialSupportType'){
+                if(this.form.specialSupportDto.specialSupportType === '2'){
+                this.formList[0].children[4].check = 'sixFont'
+                }else{
+                    this.formList[0].children[4].check = null;
+                }
+            }
+        },
         checkNumberInput(itemj, itemk) {
             if (this.form[itemj][itemk]) {
                 if (isNaN(this.form[itemj][itemk])) {
@@ -256,7 +265,20 @@ export default {
             this.$emit('hideExpand', this.formType)
         },
         handleClickSUbmitExpand() {
-            this.$emit('submitExpand', this.form, this.formType)
+            console.log(this.formList);
+            console.log(this.form);
+            this.formList.forEach((group) => {
+                group.children.forEach((item) => {
+                    if (item.check && !this.form[group.id][item.formName]) {
+                        this.$message.error(`${item.label}不能为空`);
+                        throw new Error(`${item.label}不能为空`);
+                    }
+                });
+            });
+            if (this.formType === 'add') {
+                this.form.id = this.form.partyOrgId;
+            }
+            // this.$emit('submitExpand', this.form, this.formType)
         },
         handlePartyOrgCascadarChange(selectedNode) {
             this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];

src/views/dataBoard/overview/components/ResourceScheduling.vue

@@ -1,74 +1,73 @@
 <template>
   <div>
-    <el-dialog
-        :before-close="handleClose"
-        :modal="true"
-        :modal-append-to-body="false"
-        :visible.sync="dialogVisible"
-        class="dissatisfied-detail"
-        title=""
-        width="1366px"
-    >
+    <el-dialog :before-close="handleClose" :modal="true" :modal-append-to-body="false" :visible.sync="dialogVisible"
+      class="dissatisfied-detail" title="" width="1366px">
       <div class="content">
         <div class="main-title main-title2">
-          <Title text="资源调度"/>
+          <Title text="资源调度" />
         </div>
 
         <div class="contents">
           <el-row :gutter="30">
             <el-col :span="5">
               <div class="tree">
-                <el-tree
-                    :data="data"
-                    :default-expand-all="true"
-                    :props="defaultProps"
-                    highlight-current
-                    icon-class="el-icon-arrow-right"
-                    node-key="value"
-                    @node-click="handleNodeClick"
-                />
+                <el-tree :data="data" :default-expand-all="true" :props="defaultProps" highlight-current
+                  icon-class="el-icon-arrow-right" node-key="value" @node-click="handleNodeClick" />
               </div>
             </el-col>
             <el-col :span="19">
               <div class="table">
                 <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
-                          max-height="600px">
-                  <el-table-column label="资源类型" min-width="120" prop="personnelType">
+                  max-height="600px">
+                  <el-table-column label="资源类型" min-width="120" prop="personnelType" v-if="peopleType!='4'">
                     <template slot-scope="{row}">
                       {{
-                        (row.personnelType ?
-                            data[0].children.filter(item => item.value === row.personnelType)[0].label : '') || peopleTypeLabel
+                      (row.personnelType ?
+                      data[0].children.filter(item => item.value === row.personnelType)[0].label : '') ||
+                      peopleTypeLabel
                       }}
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="所属组织" min-width="180"
-                                   prop="orgName"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="姓名/名称" min-width="120"
-                                   prop="name"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="联系电话" min-width="120"
-                                   prop="mobile">
-                    <template slot-scope="scope">
+                  <el-table-column v-if="peopleType !== '4'" label="所属组织" min-width="180"
+                    :prop="peopleType === '5'?'agencyName':'orgName'" />
+                  <el-table-column v-if="peopleType !== '4'" label="姓名/名称" min-width="120"
+                    :prop="peopleType === '5'?'unitName':'name'" />
+                  <el-table-column v-if="peopleType !== '4'&&peopleType !== '5'" label="联系电话" min-width="120"
+                    :prop="peopleType === '5'?'unitName':'name'">
+                    <template slot-scope="scope" v-if="peopleType !== '4'">
                       {{ $sensitive(scope.row.mobile, 3, 7) }}
                     </template>
                   </el-table-column>
+                  <el-table-column v-if="peopleType === '5'" label="联系人" min-width="120"
+                    prop="contact" />
+                  <el-table-column v-if="peopleType === '5'" label="联系电话" min-width="120" prop="contactMobile">
+                    <template slot-scope="scope">
+                      {{ $sensitive(scope.row.contactMobile, 3, 7) }}
+                    </template>
+                  </el-table-column>
+
                   <!--                  <el-table-column label="状态" prop="" width="120"/>-->
                   <!--                  <el-table-column label="距离" prop="" width="120"/>-->
-
-                  <el-table-column v-if="peopleType === '4'" label="所属组织" min-width="180" prop="agencyName"/>
-                  <el-table-column v-if="peopleType === '4'" label="负责人" min-width="120" prop="principalName"/>
+                  <el-table-column v-if="peopleType === '4'" label="名称" min-width="180" prop="organizationName" />
+                  <el-table-column v-if="peopleType === '4'" label="类别" min-width="180" prop="categoryName" />
+                  <el-table-column v-if="peopleType === '4'" label="所属组织" min-width="180" prop="agencyName" />
+                  <el-table-column v-if="peopleType === '4'" label="负责人" min-width="120" prop="principalName" />
                   <el-table-column v-if="peopleType === '4'" label="联系电话" min-width="120" prop="principalPhone">
                     <template slot-scope="scope">
                       {{ $sensitive(scope.row.principalPhone, 3, 7) }}
                     </template>
                   </el-table-column>
 
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织" min-width="180" prop="agencyName">
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织"
+                    min-width="180" prop="agencyName">
                     <template scope-row="row">
-                        {{this.$store.state.user.agencyName}}
+                      {{this.$store.state.user.agencyName}}
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人" min-width="120" prop="name"/>
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话" min-width="120" prop="mobile">
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人"
+                    min-width="120" prop="name" />
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话"
+                    min-width="120" prop="mobile">
                     <template slot-scope="scope">
                       {{ $sensitive(scope.row.mobile, 3, 7) }}
                     </template>
@@ -76,27 +75,22 @@
 
                   <el-table-column label="操作" prop="op" width="250">
                     <template slot-scope="scope">
-                      <CallPhone :mobile="scope.row.mobile" text="拨打电话"/>
+                      <CallPhone :mobile="scope.row.mobile" text="拨打电话" />
                       <span class="handle" @click="handleHandle">处理</span>
                       <span class="view" @click="handleViews(scope.row)">查看</span>
                     </template>
                   </el-table-column>
                 </el-table>
               </div>
-              <Pagination
-                  v-if="peopleType === '5' || peopleType === '4'"
-                  v-show="total > 0"
-                  :limit.sync="queryParams.pageSize"
-                  :page.sync="queryParams.pageNo"
-                  :total="total"
-                  @pagination="pageChange"
-              />
+              <Pagination v-if="peopleType === '5' || peopleType === '4'" v-show="total > 0"
+                :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNo" :total="total"
+                @pagination="pageChange" />
             </el-col>
           </el-row>
         </div>
       </div>
     </el-dialog>
-    <ResourceInfo ref="ResourceInfo" :currentLevelData="currentLevelData" @ok="handleHandle"/>
+    <ResourceInfo ref="ResourceInfo" :currentLevelData="currentLevelData" @ok="handleHandle" />
   </div>
 </template>
 

src/views/dataBoard/renfang/house/list.vue

@@ -178,7 +178,7 @@ export default {
       // this.displayedHouseId = item.houseId;
       // this.$router.push(`/homeDetails/index?id=${item.neighborHoodId}&buildingId=${item.buildingId}&unitId=${item.unitNumKey}`)
       console.log(item);
-      this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }`)
+      this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }&houseId=${item.houseId}`)
       
     },
 

src/views/modules/base/organization/organization.vue

@@ -1655,6 +1655,16 @@ export default {
 
     // 添加人员
     async submitPeoDo () {
+      const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
+
+      // 用于存储提取结果的 Set 对象
+      const result = new Set();
+
+      // 调用递归函数提取 level 与 agencyId 组合成的字符串
+      this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
+
+      // 将 Set 对象转换为数组
+      const manageScopeArray = Array.from(result);
       const url = "/gov/org/staff/addstaffv2";
       const {
         peoForm: { orgType },
@@ -1674,7 +1684,7 @@ export default {
             : orgType == "dept"
               ? this.currentDepartmentId
               : this.currentGridOrgId,
-        manageScopes:this.peoForm.manageScopes      
+        manageScopes:manageScopeArray      
       };
       const { data, code, msg } = await requestPost(url, params);
 

src/views/modules/communityParty/activity/eventDetails.vue

@@ -0,0 +1,254 @@
+<template>
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <div v-if="initLoading" class="m-detail-main">
+                <div class="m-info">
+
+                    <div style="display: flex;">
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动类型: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.typeId || "--" }}</span>
+                        </div>
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动名称: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.activityName || "--" }}</span>
+                        </div>
+                    </div>
+
+                    <div style="display: flex;">
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动时间: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.startTime || "--" }}至<span>{{ formData.endTime || "--" }}</span></span>
+                        </div>
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">协办方: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.assistingParty || "--" }}</span>
+                        </div>
+                    </div>
+
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动内容: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>{{ formData.content || "--" }}</span>
+                    </div>
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">活动地点: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>{{ formData.address || "--" }}</span>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2"></span>
+                        <div class="div_map">
+                            <div id="app_detail_unit"></div>
+                        </div>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">线上报名: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <el-switch :value="formData.online === 1 ? true : false" :disabled="true"></el-switch>
+                    </div>
+
+                    <div style="display: flex;">
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">报名截止时间：</span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.cutOffTime || "--" }}</span>
+                        </div>
+
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动积分：</span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.points || "--" }}</span>
+                        </div>
+                    </div>
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>{{ formData.sumUp || "--" }}</span>
+                    </div>
+                    <div class="m-info-prop" style="display: flex; flex-wrap: wrap; align-items: flex-start;">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span>
+                        <div v-for="(image, index) in formData.activityImgs" :key="index">
+                            <img style="width: 200px; height: 160px; margin-right: 30px;margin-bottom: 10px;"
+                                :src="image" alt="Image" />
+                        </div>
+                    </div>
+
+                    <div style="margin-top: 20px;">
+                        <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
+                            报名名单
+                        </div>
+                        <el-table class="table" border style="width: 100%">
+                            <el-table-column label="序号" header-align="center" align="center" type="index"
+                                width="50"></el-table-column>
+
+                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
+                                min-width="100">
+                            </el-table-column>
+                            <el-table-column prop="type" header-align="center" align="center" label="报名时间"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                                label="备注说明" show-overflow-tooltip min-width="120">
+
+                            </el-table-column>
+                            <el-table-column prop="contact" header-align="center" align="center" label="签到" width="80">
+                            </el-table-column>
+                            <el-table-column prop="contactMobile" header-align="center" align="center" label="签到地点"
+                                width="120">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+
+
+                    <div style="margin-top: 20px;">
+                        <div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;">
+                            活动实况
+                        </div>
+                        <el-table class="table" border style="width: 100%">
+                            <el-table-column label="序号" header-align="center" align="center" type="index"
+                                width="50"></el-table-column>
+
+                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                                min-width="100">
+                            </el-table-column>
+                            <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="type" header-align="center" align="center" label="实况内容"
+                                min-width="280">
+                            </el-table-column>
+                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                                label="活动照片" show-overflow-tooltip min-width="120">
+                                <template slot-scope="scope">
+                                    <div v-for="(item, index) in scope.row.serviceMatterListShow" :key="index"
+                                        style="display: flex;">
+                                        <img :src="item.url"
+                                            style="max-width: 20px; max-height: 20px; margin-right: 10px;" />
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+        <div class="m-detail-btn">
+            <el-button size="small" @click="handleCancle">关 闭</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import nextTick from "dai-js/tools/nextTick";
+import daiMap from "@/utils/dai-map";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+let loading; // 加载动画
+export default {
+    data() {
+        return {
+            formData: {},
+            initLoading: false,
+        };
+    },
+    components: {},
+    created() { },
+
+    mounted () {
+    },
+
+    methods: {
+        async activityType () {
+        const url = "/actual/base/activityType/page"
+        let params = {
+          // agencyId: this.agencyId
+          pageSize: 20,
+          pageNo: 1,
+          typeName: "",
+          enabled: 0
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.typeList = data.list
+        } else {
+          this.$message.error(msg)
+        }
+      },
+        handleCancle() {
+            this.diaDestroy();
+            this.$emit("diaDetailClose");
+        },
+
+        diaDestroy() {
+            if (map) {
+                // map.destroy()
+            }
+        },
+
+        async initForm(row) {
+            this.startLoading();
+            this.formData = JSON.parse(JSON.stringify(row));
+            this.initLoading = true;
+            // console.log('this.formData,',this.formData);
+
+            let { latitude, longitude } = this.$store.state.user;
+            console.log("lat" + latitude + ",lon" + longitude);
+            if (this.formData.latitude && this.formData.longitude) {
+                latitude = this.formData.latitude;
+                longitude = this.formData.longitude;
+            }
+            if (!latitude || latitude == "" || latitude == "0") {
+                latitude = 39.9088810666821;
+                longitude = 116.39743841556731;
+            }
+            this.endLoading();
+        },
+
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
+    },
+    computed: {},
+    props: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+// span {
+//     display: inline-block;
+//     white-space: nowrap; /* 避免换行 */
+// }
+
+</style>
+<style scoped></style>

src/views/modules/communityParty/activity/index.vue

@@ -0,0 +1,709 @@
+<template>
+  <div class="g-main">
+    <div class="m-search">
+      <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+        <div>
+
+          <el-form-item label="活动类型" prop="typtId">
+            <el-select class="item_width_1" v-model.trim="formData.typtId" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.typeName">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="活动状态" prop="unitId">
+            <el-select class="item_width_1" v-model.trim="formData.status" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="活动名称" prop="activityName">
+            <el-input v-model.trim="formData.activityName" size="small" class="item_width_1" clearable
+              placeholder="请输入关键字">
+            </el-input>
+          </el-form-item>
+
+        </div>
+        <div>
+
+          <el-form-item label="活动时间" prop="timeRange">
+            <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
+              end-placeholder="结束时间">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="活动地点" prop="address">
+            <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="协办方" prop="assistingParty">
+            <el-select class="item_width_1" v-model.trim="formData.assistingParty" size="small" placeholder="请选择"
+              clearable>
+              <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <div style="display: flex; justify-content: flex-end;">
+            <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+              @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px" class="diy-button--white" size="small"
+              @click="resetSearch">重置</el-button>
+          </div>
+        </div>
+      </el-form>
+    </div>
+    <div class="m-table">
+      <div class="div_btn">
+        <div>
+          <el-button style="" class="diy-button--add" size="small" @click="handleInitAdd">+ 发起活动</el-button>
+          <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
+        </div>
+
+        <el-button style="" class="diy-button--add" size="small">导出</el-button>
+      </div>
+
+      <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+        style="width: 100%">
+
+        <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+        <el-table-column prop="typeId" header-align="center" align="center" label="活动类型" width="180">
+        </el-table-column>
+        <el-table-column prop="activityName" header-align="center" align="center" label="活动名称" width="180">
+        </el-table-column>
+        <el-table-column prop="startTime" header-align="center" align="center" label="活动开始时间" min-width="180">
+        </el-table-column>
+        <el-table-column prop="address" header-align="center" align="center" label="活动地点" min-width="230">
+        </el-table-column>
+
+        <el-table-column prop="assistingParty" header-align="center" align="center" label="协办方" width="100">
+        </el-table-column>
+
+        <el-table-column prop="status" header-align="center" align="center" label="活动状态" width="230">
+          <template slot-scope="scope">
+            {{ getStatusText(scope.row.status) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="online" header-align="center" align="center" label="线上报名" width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.online === 1">是</span>
+            <span v-else>否</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" fixed="right" width="140" header-align="center" align="center" class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
+              @click="handleDetail(scope.row)">查看</el-button>
+
+              <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;text-decoration: underline;" size="small"
+              @click="handleEdit(scope.row)">编辑</el-button>
+
+              <el-button type="text" v-if="scope.row.status == 2" style="color:#1C6AFD;text-decoration: underline;" size="small"
+              @click="handleEdit(scope.row)">活动总结</el-button>
+
+            <!-- <el-button  type="text"
+              style="color:#00A7A9;text-decoration: underline;" size="small"
+              @click="handleEdit(scope.row)">修改</el-button> -->
+              
+            <el-button v-if="agencyId===scope.row.agencyId" type="text"
+              style="color:#D51010;text-decoration: underline;" size="small"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+          :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+      width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+      <activity-records ref="ref_form" :unitList="corganizerList" :gridList="gridList" @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"></activity-records>
+    </el-dialog>
+
+    <el-dialog :visible.sync="initShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+      width="950px" top="5vh" class="dialog-h" @closed="diaInitClose">
+      <initiate-activity ref="ref_form" :unitList="corganizerList" :gridList="gridList"
+        @dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></initiate-activity>
+    </el-dialog>
+
+
+    <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
+      width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
+      <event-details ref="ref_detail" :gridList="gridList" @diaDetailClose="detailClosed"></event-details>
+    </el-dialog>
+
+  </div>
+</template>
+  <script>
+  
+  import eventDetails from './eventDetails'
+  import initiateActivity from './initiateActivity'
+  import util from '@js/util.js';
+  import { requestPost,requestGet } from "@/js/dai/request";
+  import { mapGetters } from 'vuex'
+  import { Loading } from 'element-ui' // 引入Loading服务
+  
+  let loading // 加载动画
+  export default {
+    data () {
+      return {
+        loading: false,
+        total: 0,
+        pageSize: 10,
+        pageNo: 0,
+        tableLoading: false,
+        agencyId: '',
+        gridList: [],//所属网格
+        unitList: [],
+        statuslist: [
+          { value: 0, label: '未进行' },
+          { value: 1, label: '进行中' },
+          { value: 2, label: '已结束' }
+        ],
+        typeList:[],//活动类型
+        corganizerList:[],//协办方list
+        pickerOptions: { //控制时间范围
+          disabledDate (time) {
+            return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
+          }
+        },
+  
+        timeRange: [],
+        unitId: '',
+        formData: {
+          activityName: "",
+          status: "",
+          typtId: "",
+          startTime: "",
+          endTime: "",
+          address: "",
+          assistingParty: ""
+        },
+  
+  
+        tableData: [],
+  
+        //form相关
+        formShow: false,
+        initShow:false,
+        formTitle: '新增活动',
+        detailShow: false,
+  
+        files: "",
+        fileName: "",
+        uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
+        // searchdemandOptions:[],
+        detail:{}
+      }
+    },
+    components: {
+       eventDetails, initiateActivity
+    },
+    async created () {
+  
+    },
+    async mounted () {
+      //获取服务事项
+      await this.getDemandOptions()
+  
+      const { user } = this.$store.state
+      this.agencyId = user.agencyId
+  
+      //获取活动类型
+      this.activityType()
+
+      this.loadGrid()
+      //获取网格下拉框数据
+      // this.loadTable()
+
+      this.listServerOrg()
+      this.communityActivityList()
+  
+    },
+  
+    methods: {
+      getStatusText(status) {
+        switch (status) {
+          case 0:
+            return '未进行';
+          case 1:
+            return '进行中';
+          case 2:
+            return '已结束';
+          default:
+            return '';
+        }
+      },
+      async listServerOrg() {
+        const url = "/actual/base/serviceitem/listServerOrgNewTask";
+        // const url = "/actual/base/activityType/page";
+        let params = {  
+          serverOrgCategoryCode: "",
+          serverOrgType: "party_unit",
+          serverParentOrgCategoryCode: ""
+          // "pageSize": 20,
+          // "pageNo": 1,
+          // "typeName": "",
+          // "enabled": 0
+        };
+
+        let { data, code, msg } = await requestPost(url, params);
+        if (code == 0) {
+          this.corganizerList = data;
+          // console.log("corganizerList",this.corganizerList)
+        } else if (code >= 8000) {
+          this.$message.error(msg);
+        }
+      },
+      async communityActivityList() {
+        const url = "/actual/base/communityActivity/page";
+        
+        let params = {
+          pageSize: this.pageSize,
+          pageNo: this.pageNo,
+          agencyId: this.agencyId,
+          ...this.formData,
+        };
+        let { data, code, msg } = await requestPost(url, params);
+           if (code === 0) {
+          this.total = data.total
+          this.tableData = data.list
+          // console.log("datadatadata",this.tableData)
+        } else {
+          this.$message.error(msg)
+        }
+      },
+
+      // handleCateCHange(val) {
+      //   if (val.length === 2) {
+      //     this.formData.serviceMatter = val[1];
+      //   } else {
+      //     this.formData.serviceMatter = val[0];
+      //   }
+      // },
+      async getDemandOptions() {
+        this.$http
+          .post("/actual/base/serviceitem/listAllCategory")
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg);
+            } else {
+              this.searchdemandOptions = this.getTreeData(res.data);
+            }
+          })
+          .catch(() => {
+            return this.$message.error("网络错误");
+          });
+      },
+      getTreeData(data) {
+        if (!Array.isArray(data)) return [];
+        let arr = data.map((item) => {
+          let _item = {};
+          if (item.childCateList) {
+            if (item.childCateList.length === 0)
+              _item = { ...item, childCateList: undefined };
+            else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+          } else {
+            _item = { ...item };
+          }
+          return _item;
+        });
+        return arr;
+      },
+      handleSearch () {
+        this.communityActivityList()
+      },
+      async loadGrid () {
+        const url = "/gov/org/customergrid/gridoption"
+  
+        let params = {
+          agencyId: this.agencyId
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.gridList = data
+  
+        } else {
+          this.$message.error(msg)
+        }
+  
+      },
+
+
+      async activityType () {
+        const url = "/actual/base/activityType/page"
+        let params = {
+          // agencyId: this.agencyId
+          pageSize: 20,
+          pageNo: 1,
+          typeName: "",
+          enabled: 0
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.typeList = data.list
+        } else {
+          this.$message.error(msg)
+        }
+      },
+  
+      diaClose () {
+  
+        this.$refs.ref_form.resetData()
+        this.formShow = false
+      },
+      diaInitClose() {
+
+        this.$refs.ref_form.resetData()
+        this.initShow = false
+      },
+  
+      detailClosed () {
+        console.log(this.$refs.ref_detail)
+        this.$refs.ref_detail.diaDestroy()
+        this.detailShow = false
+      },
+  
+  
+      handleDetail (row) {
+        this.detailShow = true
+        this.formTitle = '详情'
+  
+        this.$nextTick(() => {
+          this.$refs.ref_detail.initForm(row)
+          // this.$refs.ref_form.initForm('detail', row.id)
+        })
+      },
+  
+      // handleAdd () {
+      //   this.formTitle = '新增'
+  
+      //   this.formShow = true
+      //   this.$nextTick(() => {
+      //     this.$refs.ref_form.initForm('add', null)
+      //   })
+      // },
+      handleAdd () {
+        this.formTitle = '活动记录'
+        this.initShow = true
+        // this.formShow = true
+        this.$nextTick(() => {
+          this.$refs.ref_form.initForm('records', null)
+        })
+      },
+      handleInitAdd (e) {
+        this.formTitle = '发起活动'
+        this.initShow = true
+        this.$nextTick(() => {
+          this.$refs.ref_form.initForm('add', null)
+          // this.$refs.ref_detail.initForm(row)
+        })
+      },
+      handleEdit (row) {
+        this.formTitle = '修改'
+        // this.formShow = true
+        this.initShow = true
+        this.$nextTick(() => {
+          // this.$refs.ref_form.initForm('edit', row.id)
+          this.$refs.ref_form.initForm('edit', row)
+        })
+      },
+  
+      addFormCancle () {
+        this.formShow = false
+      },
+      addFormCancleInit () {
+        this.initShow = false
+      },
+      addFormOk () {
+        this.formShow = false
+        // this.loadTable()
+        this.communityActivityList()
+  
+      },
+      addFormOkInit () {
+        this.initShow = false
+        // this.loadTable()
+        this.communityActivityList()
+  
+      },
+  
+      async handleDelete (row) {
+  
+        this.$confirm("确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteActivity(row)
+          })
+          .catch(err => {
+            if (err == "cancel") {
+  
+            }
+  
+          });
+      },
+  
+      async deleteActivity (row) {
+        const url = "/actual/base/icpartyactivity/delete"
+        // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
+  
+        let params = {
+          id: row.id
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "删除成功"
+          });
+  
+          // this.loadTable()
+          this.communityActivityList()
+        } else {
+          this.$message.error(msg)
+        }
+      },
+  
+      //重置搜索条件
+      resetSearch () {
+        this.timeRange = []
+        this.formData = {
+          activityName: "",
+          status: "",
+          typtId: "",
+          startTime: "",
+          endTime: "",
+          address: "",
+          assistingParty: ""
+        }
+        this.pageSize = 20
+        this.pageNo = 1
+        // this.loadTable()
+        this.communityActivityList()
+      },
+  
+      //导出表格
+      async handleExport () {
+        let title = '联建活动列表'
+  
+        const url = "/heart/icpartyactivity/export"
+        let params = {
+          agencyId: this.agencyId,
+  
+          ...this.formData
+  
+        }
+  
+        app.ajax.exportFilePost(
+          url,
+          params,
+          (data, rspMsg) => {
+  
+            this.download(data, title + '.xls')
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg);
+          }
+        );
+  
+      },
+  
+      // 下载文件
+      download (data, fileName) {
+        if (!data) {
+          return
+        }
+  
+        var csvData = new Blob([data])
+  
+        if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+          window.navigator.msSaveOrOpenBlob(csvData, fileName);
+        }
+        // for Non-IE (chrome, firefox etc.)
+        else {
+          var a = document.createElement('a');
+          document.body.appendChild(a);
+          a.style = 'display: none';
+          var url = window.URL.createObjectURL(csvData);
+          a.href = url;
+          a.download = fileName;
+          a.click();
+          a.remove();
+          window.URL.revokeObjectURL(url);
+        }
+  
+      },
+  
+      // 上传文件之前的钩子
+      beforeUpload (file) {
+        this.files = file;
+  
+        const isText = file.type === 'application/vnd.ms-excel'
+        const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+  
+        if (!isText && !isTextComputer) {
+          this.$message.error('请选择正确格式的文件')
+          return false
+        } else {
+          this.fileName = file.name;
+          return true
+        }
+  
+      },
+      // 上传文件个数超过定义的数量
+      handleExceed (files, fileList) {
+        this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+      },
+  
+      async uploadFile () {
+        this.loading = true
+  
+        if (this.fileName == "") {
+          this.$message.warning('请选择要上传的文件！')
+          return false
+        }
+  
+        //清空上传列表
+        this.$refs['upload'].clearFiles()
+  
+        var url = '/heart/icpartyactivity/import'
+        let fileFormData = new FormData();
+        fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+  
+        const { data, code, msg } = await requestPost(url, fileFormData)
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "导入成功"
+          });
+  
+          // this.loadTable()
+          this.communityActivityList()
+        } else {
+          this.$message.error(msg)
+        }
+  
+  
+      },
+  
+      handleTimeChange (time) {
+        if (time) {
+          const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+          const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+  
+          this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+          this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+        } else {
+          this.formData.startTime = ''
+          this.formData.endTime = ''
+        }
+      },
+  
+      handleSizeChange (val) {
+        this.pageSize = val
+        this.pageNo = 1
+        // this.loadTable()
+        this.communityActivityList()
+      },
+      handleCurrentChange (val) {
+        this.pageNo = val
+        // this.loadTable()
+        this.communityActivityList()
+      },
+  
+      // 开启加载动画
+      startLoading () {
+        loading = Loading.service({
+          lock: true, // 是否锁定
+          text: '正在加载……', // 加载中需要显示的文字
+          background: 'rgba(0,0,0,.7)' // 背景颜色
+        })
+      },
+      // 结束加载动画
+      endLoading () {
+        // clearTimeout(timer);
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    computed: {
+      tableHeight () {
+  
+        return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
+  
+      },
+  
+      ...mapGetters(['clientHeight', 'iframeHeight'])
+    },
+    watch: {
+  
+    },
+    props: {
+  
+    }
+  }
+  </script>
+  <style lang="scss" scoped >
+  .g-main {
+    width: 100%;
+  }
+
+  .m-search {
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 30px 20px 5px;
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  }
+
+  .item_width_1 {
+    width: 260px;
+  }
+
+  .item_width_2 {
+    width: 495px;
+  }
+
+  .m-table {
+    background: #ffffff;
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+    margin-top: 15px;
+    padding: 23px 30px 10px;
+
+    .table {
+      margin-top: 20px;
+    }
+  }
+
+  .div_btn {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .el-row {
+    /* margin-bottom: 20px; */
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 10px;
+    margin-right: 50px;
+  }
+</style>
+  

src/views/modules/communityParty/activity/initiateActivity.vue

@@ -0,0 +1,853 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
+                class="form">
+                <el-form-item label="活动类型" label-width="150px" prop="typeId">
+                    <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
+                        <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
+                            :value="item.typeName">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="活动名称" prop="activityName" label-width="150px">
+                    <el-input v-model.trim="formData.activityName" size="small" clearable placeholder="请输入活动名称"
+                        class="u-item-width-normal"></el-input>
+                </el-form-item>
+
+                <el-form-item label="活动时间" prop="startTime" label-width="130px">
+                    <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+                        value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
+                        start-placeholder="开始时间" end-placeholder="结束时间">
+                    </el-date-picker>
+                </el-form-item>
+
+                <!-- <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                    <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
+                        :props="{ label: 'label', value: 'name'}" clearable collapse-tags size="small"
+                        class="u-item-width-normal"></el-cascader>
+                </el-form-item> -->
+                <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                    <el-select class="u-item-width-normal" v-model.trim="formData.assistingParty" placeholder="请选择"
+                        clearable>
+                        <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name"
+                            class="u-item-width-normal">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="活动封面图" label-width="140px" prop="coverPic">
+                    <template>
+                        <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"></upload-image>
+                    </template>
+                </el-form-item>
+
+                <el-form-item label="活动内容" prop="content" label-width="150px" style="display: block">
+                    <div class="item_width_1">
+                        <!-- <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
+                            :height="250" placeholder="在这里输入文字" /> -->
+                        <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
+                        </el-input>
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
+                    <div style="width: 500px">
+                        <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                            :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                            :loading="loading">
+                            <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                        <div id="app_activity" class="div_map"></div>
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="线上报名" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
+                </el-form-item>
+
+                <div v-if="records">
+                    <div v-if="!online">
+                        <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                            <div class="item_width_1">
+                                <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                                </el-input>
+                            </div>
+                        </el-form-item>
+
+                        <!-- <el-form-item label="活动照片" label-width="140px">
+                            <template>
+                                <upload-image :defaultFileList="activityImgs" :limit="6"
+                                    @change="onChangeImgs"></upload-image>
+                            </template>
+                        </el-form-item> -->
+
+                        <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                            <div>
+                                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                                    :data="{ customerId: customerId }" :show-file-list="true"
+                                    :file-list="formData.activityImgs" :on-preview="handleImgPreview"
+                                    :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                                    :on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
+                                    list-type="picture-card" :limit="3">
+                                    <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                            </div>
+                            <div>
+                                <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img"
+                                        alt="照片" style="width: 150px; margin-right: 10px;">
+                                </div>
+                                <div v-else>
+                                    暂无照片
+                                </div>
+                            </div>
+                        </el-form-item>
+                    </div>
+                </div>
+
+                <div v-if="online">
+                    <el-form-item label="报名截止时间" label-width="140px" prop="cutOffTime">
+                        <el-date-picker v-model.trim="formData.cutOffTime" type="date" value-format="yyyy-MM-dd"
+                            format="yyyy-MM-dd" placeholder="选择报名截止时间" style="width:280px">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="活动积分" label-width="140px" prop="points">
+                        <el-input-number v-model="formData.points" @change="handleChange" :min="1" :max="10"
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="活动人数" label-width="140px">
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" :max="10"
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="消息推送" label-width="140px">
+                        <el-checkbox-group v-model="formData.sendMessage">
+                            <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </div>
+
+
+
+
+
+            </el-form>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+                @click="handleComfirm">确
+                定</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import Tinymce from '@c/tinymce2/index.vue'
+import daiMap from "@/utils/dai-map";
+import util from '@js/util.js';
+// import UploadImage from './upload-image.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+    data() {
+        let initFormData = () => {
+            let _form = {
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 1,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude,//纬度
+                imgList:[]
+            }
+
+            return _form
+        }
+        return {
+            fileList: [],//封面图片
+            activityImgs:[],//活动照片
+            formType: 'add', //表单操作类型 add新增，edit编辑,records记录
+            records:false,
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            num: 0,
+            loading: false,
+            timeRange: [],
+            online: false,
+
+            btnDisable: false,
+
+            keyWords: '',
+            activityId: '',
+            formData: initFormData(),
+            serviceList: [],
+            // gridList: [],
+            agencyId: '',
+
+            demandOptions: [],
+            typeList: [],
+            corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+
+        }
+    },
+    components: { Tinymce, UploadImage },
+    mounted() {
+        this.activityType()
+        this.listServerOrg()
+
+    },
+
+    methods: {
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                // this.formData.activityImgs.push({
+                //     format,
+                //     name: file.name,
+                //     size: file.size,
+                //     type,
+                //     url: res.data.url
+                // });
+                this.formData.activityImgs.push(res.data.url);
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+        async listServerOrg() {
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: "",
+                serverOrgType: "party_unit",
+                serverParentOrgCategoryCode: ""
+            };
+
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.corganizerList = data;
+                // console.log("datadata",this.corganizerList)
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
+        async activityType() {
+            const url = "/actual/base/activityType/page"
+            let params = {
+                // agencyId: this.agencyId
+                pageSize: 20,
+                pageNo: 1,
+                typeName: "",
+                enabled: 0
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.typeList = data.list
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        handleOnlineRegistration(value) {
+            // console.log(value)
+            if (value) {
+                this.online = true;
+                this.formData.online = 1;
+            } else {
+                this.online = false;
+                this.formData.cutOffTime = ''
+                this.formData.online = 0;
+            }
+        },
+
+        onChangeFileList(e) {
+            if (e.length > 0) {
+                let item = e[0];
+                let ob = {
+                    fileType: '0',
+                    fileUrl: item.response.data.url
+                };
+                this.fileList = [ob];
+                this.formData.coverPic = ob.fileUrl;
+            }
+        },
+
+        onChangeImgs(e, rowIndex = 0) {
+            console.log('onChangeFileList', e)
+            if (e.length > 0) {
+                this.activityImgs = []
+                e.forEach(item => {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: item.response.data.url
+                    }
+                    this.activityImgs.push(ob)
+                })
+            }
+        },
+
+        // onChangeImgs(e) {
+        //     this.activityImgs = [];
+        //     if (e.length > 0) {
+        //         e.forEach(item => {
+        //             let ob = {
+        //                 fileType: '0',
+        //                 fileUrl: item.response.data.url
+        //             };
+        //             this.activityImgs.push(ob);
+        //         });
+        //         console.log('this.activityImgs',this.activityImgs)
+        //     }
+        // },
+
+        handleChange(value) {
+            console.log(value);
+        },
+        handleTimeChange(time) {
+            if (time) {
+                const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+                const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+                this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+                this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+                // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+                // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+            } else {
+                this.formData.startTime = ''
+                this.formData.endTime = ''
+            }
+
+        },
+
+         // async initForm(row) {
+        //     this.startLoading();
+        //     this.formData = JSON.parse(JSON.stringify(row));
+        //     this.initLoading = true;
+        //     console.log('this.formData,',this.formData);
+
+        //     let { latitude, longitude } = this.$store.state.user;
+        //     console.log("lat" + latitude + ",lon" + longitude);
+        //     if (this.formData.latitude && this.formData.longitude) {
+        //         latitude = this.formData.latitude;
+        //         longitude = this.formData.longitude;
+        //     }
+        //     if (!latitude || latitude == "" || latitude == "0") {
+        //         latitude = 39.9088810666821;
+        //         longitude = 116.39743841556731;
+        //     }
+        //     this.endLoading();
+        // },
+        async initForm(type, activityId) {
+            this.startLoading()
+            console.log("啊实打实的", type, activityId)
+            this.formType = type
+            if (type === 'edit') {
+                if(activityId.activityImgs || activityId.sumUp){
+                    this.records = true
+                }
+                // this.records = false
+                this.formData = activityId
+                this.timeRange = [this.formData.startTime, this.formData.endTime]
+                if (activityId.coverPic) {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: activityId.coverPic
+                    };
+                    this.fileList = [ob];
+                    this.formData.coverPic = ob.fileUrl;
+                    if(this.formData.online == 1){
+                        this.online = true
+                    }
+                }
+                // this.$refs.ref_form.resetFields();
+
+
+                // //获取服务事项
+                // await this.getDemandOptions()
+
+                // let { latitude, longitude } = this.$store.state.user;
+                // if (activityId) {
+                //     this.activityId = activityId
+                //     this.formData.id = activityId
+                //     await this.loadFormData()
+                // } else {
+                //     this.formData.latitude = latitude
+                //     this.formData.longitude = longitude
+                // }
+                this.$nextTick(() => {
+                    if (!map) {
+                        this.initMap(this.formData.latitude, this.formData.longitude);
+                    } else {
+                        map.setCenter(this.formData.latitude, this.formData.longitude);
+                        map.setMarker(this.formData.latitude, this.formData.longitude);
+                    }
+                })
+            }else if (type === 'records') {
+                this.records = true
+            }
+            
+            this.endLoading()
+
+        },
+
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        );
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+
+            let params = {
+                agencyId: this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.gridList = data
+
+            } else {
+                this.$message.error(msg)
+            }
+
+        },
+
+
+        //加载组织
+        async loadFormData() {
+            const url = '/actual/base/icpartyactivity/detail'
+            // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+            let params = {
+                id: this.activityId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.formData = data
+                let style_img = "style='width:50px;height:40px;' "
+
+                if (this.formData.content) {
+                    // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+                    // let array=this.formData.content.split('<img')
+                }
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            console.log("data/actual/base/communityActivity/save",this.formData)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                const dateObj = this.formData.startTime.split(' ');
+                const formattedDate = dateObj[0]; // 获取日期部分，即 '2424-10-22'
+                if(this.formData.cutOffTime  !=  '' && formattedDate <= this.formData.cutOffTime){
+                    this.$message.error('报名截止时间要小于活动开始时间')
+                }else  if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else{
+                    this.addActivity()
+                }
+            })
+        },
+        async addActivity() {
+            if (this.formType === 'edit') {
+                let url = '/actual/base/communityActivity/update'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }else{
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }
+            
+
+        },
+
+        handleCancle() {
+
+            this.resetData()
+            this.$emit('dialogCancle')
+
+        },
+
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+
+            map = new daiMap(
+                document.getElementById("app_activity"),
+                { latitude, longitude },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45, // 设置地图旋转角度
+                }
+            );
+
+            // 监听地图平移结束
+            /*  map.on("dragend", (e) => {
+                this.handleMoveCenter(e);
+              });*/
+            map.on("click", (e) => {
+                this.handleMoveCenter(e);
+            });
+
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+
+        },
+
+
+        async handleMoveCenter(e) {
+            //修改地图中心点
+            // const { lat, lng } = map.getCenter();
+            const { lat, lng } = e.latLng;
+            this.formData.latitude = lat;
+            this.formData.longitude = lng;
+            map.setMarker(lat, lng);
+
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == "success") {
+                this.formData.address = data.address
+                this.searchValue = data.address
+                this.searchOptions = []
+                console.log('data,this.searchValue ',this.searchValue )
+
+            }
+        },
+
+        async remoteMethod(query) {
+
+            if (query !== '') {
+                this.loading = true;
+
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = []
+
+                if (msg == "success" && data.resultList && data.resultList.length > 0) {
+
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList
+                        this.searchOptions = this.resultList.map(item => {
+                            return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
+
+                        });
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ]
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
+
+        handleClickKey(index) {
+            let selPosition = this.resultList[index]
+            let lonlat = selPosition.lonlat.split(" ")
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.formData.latitude = lonlat[1];
+            this.formData.longitude = lonlat[0];
+            this.formData.address = selPosition.address + selPosition.name
+        },
+
+        resetData() {
+            this.timeRange = []
+            this.fileList = []
+            this.searchValue = ''
+            this.searchOptions = []
+            this.resultList = []
+            this.activityId = ''
+            this.keyWords = ''
+            this.online = false
+            this.formData = {
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 1,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude//纬度
+            }
+
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                activityName: [
+                    { required: true, message: '活动名称不能为空', trigger: 'blur' }
+                ],
+                typeId:[
+                    { required: true, message: '请选择活动类型', trigger: 'blur' }
+                ],
+                startTime:[
+                    { required: true, message: '请选择活动时间', trigger: 'blur' }
+                ],
+                coverPic:[
+                    { required: true, message: '请选择活动封面图', trigger: 'blur' }
+                ],
+                content: [
+                    { required: true, message: '活动内容不能为空', trigger: 'blur' }
+                ],
+                address: [
+                    { required: true, message: '请选择活动地点', trigger: 'blur' }
+                ],
+                longitude: [
+                    { required: true, message: '坐标不能为空', trigger: 'blur' }
+                ],
+                cutOffTime: [
+                    { required: true, message: '请选择报名截止时间', trigger: 'blur' }
+                ],
+                points: [
+                    { required: true, message: '请选择活动积分', trigger: 'blur' }
+                ],
+                sumUp: [
+                    { required: true, message: '请输入活动总结', trigger: 'blur' }
+                ],
+                activityImgs: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+
+    },
+    props: {
+
+        // unitList: {
+        //     type: Array,
+        //     default: []
+        // },
+        gridList: {
+            type: Array,
+            default: []
+        },
+
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
+    width: 560px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+
+.tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+}
+
+.div_map {
+    position: relative;
+}
+
+.div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+}
+
+.tinymce_view {
+    height: 400px;
+    overflow: auto;
+}
+
+.text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+
+    >p {
+        margin: 0;
+    }
+}
+</style>

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

@@ -48,7 +48,7 @@
         </el-form-item>
         <el-form-item label="联系人" prop="contact">
           <el-input
-            v-model.trim="formData.contact"
+            v-model.trim="formData.contactName"
             class="u-item-width-normal"
             size="small"
             clearable

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

@@ -76,8 +76,8 @@
             class="u-item-width-normal"
           ></el-cascader>
         </el-form-item>
-        <el-form-item label="联系人" prop="contact">
-          <el-select v-model.trim="formData.contact" class="u-item-width-normal" size="small" clearable
+        <el-form-item label="联系人" prop="principalId">
+          <el-select v-model.trim="formData.principalId" class="u-item-width-normal" size="small" clearable
             placeholder="请选择联系人" @change="handelChangeStaff">
             <el-option v-for="item in dicts.stafflist"
                   :key="item.value"
@@ -200,7 +200,7 @@ export default {
         unitName: "",
         serviceMatterList: [],
         type: "",
-        contact: "",
+        principalId: "",
         contactMobile: "",
         memberCount: 0,
         remark: "", //备注【最大500字】
@@ -237,15 +237,16 @@ export default {
     const { user } = this.$store.state;
     this.agencyId = user.agencyId;
     this.getStafflist()
-   
   },
 
   methods: {
     handelChangeStaff(val){
       if(val){
-        this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile
+        this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile;
+        this.formData.contact = val;
       }else{
-        this.formData.contactMobile = ''
+        this.formData.contactMobile = '';
+        this.formData.contact = '';
       }
     },
     getStafflist() {
@@ -510,7 +511,7 @@ export default {
         unitName: "",
         serviceMatterList: [],
         type: "",
-        contact: "",
+        principalId: "",
         contactMobile: "",
         memberCount: 0,
         remark: "", //备注【最大500字】
@@ -543,7 +544,7 @@ export default {
         ],
         type: [{ required: true, message: "分类不能为空", trigger: "blur" }],
 
-        contact: [
+        principalId: [
           { required: true, message: "联系人不能为空", trigger: "blur" },
         ],
         contactMobile: [

src/views/modules/communityService/gxxq/addForm.vue

@@ -339,7 +339,7 @@ export default {
           { max: 1000, message: "不能超出1000个字符", trigger: "blur" },
         ],
         resiSearchTagId: [
-          { required: false, message: "指派人员不能为空", trigger: "bulr" },
+          { required: true, message: "指派人员不能为空", trigger: "bulr" },
         ],
         categoryCode: [
           { required: true, message: "需求分类不能为空", trigger: "bulr" },
@@ -383,13 +383,6 @@ export default {
         this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
       }
     },
-    "formData.assignFlag"(newValue) {
-      if (newValue === 1) {
-        this.dataRule.resiSearchTagId[0].required = true;
-      } else {
-        this.dataRule.resiSearchTagId[0].required = false;
-      }
-    },
   },
   components: { labelForm },
   created() {},
@@ -431,7 +424,7 @@ export default {
           this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
           this.newFormData.serverOrgType = data.assignInfo.serverOrgType;
           this.newFormData.serverOrgId = data.assignInfo.serverOrgId;
-          this.newFormData.noticeApproches = data.assignInfo.noticeApproches;
+          this.newFormData.noticeApproches = data.assignInfo.noticeApproches || [];
 
           for (let i in data.assignInfo.serviceScopeList) {
             this.newFormData.serviceScopeList.push(

src/views/modules/home/index.vue

@@ -503,7 +503,16 @@ export default {
         this.$router.push({
             path: obj[item.category],
           });
-      }
+      } else if(item.msgType == "sys_version_upgrade_publish"){
+				let {  targetId } = item
+				this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
+				this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+					if (item.name === "notice-version") {
+						return { ...item };
+					}
+					return item;
+				});
+			}
       this.getNoticeData()
     },
    

src/views/modules/portrayal/jumin/index.vue

@@ -26,7 +26,7 @@
           >
             <span>{{ item.name }}</span
             ><span
-            v-if="item.id != 'businessRecord' && item.id != 'updateRecord' "
+            v-if="item.id != 'businessRecord' && item.id != 'updateRecord'&& item.id != 'reside' && item.id != 'ext'"
               :class="{
                 incomplete: item.filledQty != item.totalQty && index != active,
                 full: item.filledQty == item.totalQty,
@@ -250,8 +250,8 @@
         </div>
       <div  class="flex_box">
         <div class="f-flex">
-              <div class="f-label"><b>人房关系：</b></div>
-              <span class="f-left8 f-font-color">
+              <div class="f-label">人房关系：</div>
+              <span class="f-left8 ">
                 {{
                   item.resiHouseRel != null
                     ? item.resiHouseRel === 0
@@ -264,7 +264,7 @@
               </span>
           </div>
             <div class="f-flex">
-              <div class="f-label"><b>人户状况：</b></div>
+              <div class="f-label">人户状况：</div>
               <span class="f-left8 f-font-color">{{
                 householdSituationText(indexK)
               }}</span>
@@ -276,7 +276,7 @@
             </div>
           </div>
           <div  class="f-flex">
-            <div class="f-label"><b>与户主关系：</b></div>
+            <div class="f-label">与户主关系：</div>
             <span class="f-left8 f-font-color">{{
               houseHolderRelText(indexK)
             }}</span>
@@ -296,7 +296,7 @@
           </div>
           
         <div  class="f-flex">
-          <div class="f-label"><b>就业状态：</b></div>
+          <div class="f-label">就业状态：</div>
           <span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
             {{ careerStatusText() }}
           </span>

src/views/modules/workSys/typeActivity/index.vue

@@ -0,0 +1,354 @@
+<template>
+    <div class="g-main">
+        <div class="m-search">
+            <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
+                <div>
+
+
+                    <el-form-item label="标签名称" >
+                        <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable
+                            placeholder="请输入">
+                        </el-input>
+                    </el-form-item>
+
+                    <el-form-item label="首页显示">
+                        <el-select class="item_width_1" v-model.trim="enabled" size="small" placeholder="请选择"
+                            clearable>
+                            <el-option v-for="item in unitList" :key="item.value" :label="item.name"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+
+
+                    <div style="display: flex; justify-content: flex-end;">
+                        <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+                            @click="handleSearch">查询</el-button>
+                        <el-button style="margin-left:10px" class="diy-button--white" size="small"
+                            @click="resetSearch">重置</el-button>
+                    </div>
+                </div>
+            </el-form>
+        </div>
+        <div class="m-table">
+            
+            <div class="div_btn">
+                <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+            </div>
+
+            <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+                style="width: 100%">
+
+                <el-table-column label="序号" header-align="center" align="center" type="index"
+                    width="80"></el-table-column>
+                <el-table-column prop="typeName" header-align="center" align="center" label="类型名称" width="380">
+                </el-table-column>
+                
+                <el-table-column prop="peopleCount" header-align="center" align="center" label="创建时间" width="380">
+                </el-table-column>
+
+                <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
+                    class="operate">
+                    <template slot-scope="scope">
+
+                        <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
+                            @click="handleDetail(scope.row)">查看</el-button>
+                        <el-button type="text"
+                            style="color:#00A7A9;text-decoration: underline;" size="small"
+                            @click="handleEdit(scope.row)">修改</el-button>
+
+                        <!-- <el-button type="text"
+                            style="color:#D51010;text-decoration: underline;" size="small"
+                            @click="handleDelete(scope.row)">删除</el-button> -->
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div>
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
+                    layout="sizes, prev, pager, next, total" :total="total">
+                </el-pagination>
+            </div>
+        </div>
+
+        <!-- 修改弹出框 -->
+        <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
+            :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+            <type-activityadd ref="ref_form" :unitList="corganizerList" :gridList="gridList"
+                @dialogCancle="addFormCancle" @dialogOk="addFormOk"></type-activityadd>
+        </el-dialog>
+
+        <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false"
+            :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+            <type-details ref="ref_detail"  :gridList="gridList"
+            @dialogCancle="addFormQ"></type-details>
+        </el-dialog>
+    </div>
+</template>
+
+    <script>
+
+    import typeActivityadd from './typeActivityadd'
+    import typeDetails from './typeDetails'
+    import util from '@js/util.js';
+    import { requestPost,requestGet } from "@/js/dai/request";
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    
+    let loading // 加载动画
+    export default {
+      data () {
+        return {
+          loading: false,
+          total: 0,
+          pageSize: 10,
+          pageNo: 0,
+          tableLoading: false,
+          agencyId: '',
+          gridList: [],//所属网格
+          typeName:'',
+          enabled:'',
+          //form相关
+          formShow: false,
+          formTitle: '新增活动',
+          detailShow: false,
+        }
+      },
+      components: {
+        typeActivityadd, typeDetails
+      },
+      async created () {
+    
+      },
+      async mounted () {
+        //获取服务事项
+        // await this.getDemandOptions()
+    
+        const { user } = this.$store.state
+        this.agencyId = user.agencyId
+    
+        //获取建联单位
+        // this.loadUnit()
+        // this.loadGrid()
+        //获取网格下拉框数据
+        this.loadTable()    
+      },
+    
+      methods: {
+        handleSearch () {
+          this.loadTable()
+        },
+        //展示表格
+        async loadTable () {
+          this.tableLoading = true
+          const url = "/actual/base/activityType/page"
+          let params = {
+            // agencyId: this.agencyId,
+            // pageSize: this.pageSize,
+            // pageNo: this.pageNo,
+            // ...this.formData
+            pageSize: 20,
+            pageNo: 1,
+            typeName: this.typeName,
+            enabled: 0
+          }
+          const { data, code, msg } = await requestPost(url, params)
+          if (code === 0) {
+            // console.log("啊倒萨打算",data)
+            this.total = data.total
+            this.tableData = data.list
+          } else {
+            this.$message.error(msg)
+          }
+          this.tableLoading = false
+        },
+    
+    
+    
+        diaClose () {
+    
+          // this.$refs.ref_form.resetData()
+          this.formShow = false
+        },
+    
+        detailClosed () {
+          console.log(this.$refs.ref_detail)
+          // this.$refs.ref_detail.diaDestroy()
+          this.detailShow = false
+        },
+    
+    
+        handleDetail (row) {
+          this.detailShow = true
+          this.formTitle = '详情'
+    
+          this.$nextTick(() => {
+            this.$refs.ref_detail.initForm(row)
+            // this.$refs.ref_form.initForm('detail', row.id)
+          })
+        },
+    
+        handleAdd () {
+          this.formTitle = '新增'
+    
+          this.formShow = true
+          this.$nextTick(() => {
+            // this.$refs.ref_form.initForm('add', null)
+          })
+        },
+        handleEdit (row) {
+          this.formTitle = '修改'
+          this.formShow = true
+          this.$nextTick(() => {
+            this.$refs.ref_form.initForm(row)
+          })
+        },
+    
+        addFormCancle () {
+          this.formShow = false
+        },
+        addFormQ(){
+          this.detailShow = false
+        },
+        addFormOk () {
+          this.formShow = false
+          this.loadTable()
+    
+        },
+    
+        async handleDelete (row) {
+    
+          this.$confirm("确认删除?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              this.deleteActivity(row)
+            })
+            .catch(err => {
+              if (err == "cancel") {
+    
+              }
+    
+            });
+        },
+    
+        async deleteActivity (row) {
+          const url = "/actual/base/icpartyactivity/delete"
+          // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
+    
+          let params = {
+            id: row.id
+          }
+    
+          const { data, code, msg } = await requestPost(url, params)
+    
+          if (code === 0) {
+            this.$message({
+              type: "success",
+              message: "删除成功"
+            });
+    
+            this.loadTable()
+          } else {
+            this.$message.error(msg)
+          }
+        },
+    
+        //重置搜索条件
+        resetSearch () {
+          this.typeName = ''
+          this.loadTable()
+        },
+
+        handleSizeChange (val) {
+          this.pageSize = val
+          this.pageNo = 1
+          this.loadTable()
+        },
+        handleCurrentChange (val) {
+          this.pageNo = val
+          this.loadTable()
+        },
+    
+        // 开启加载动画
+        startLoading () {
+          loading = Loading.service({
+            lock: true, // 是否锁定
+            text: '正在加载……', // 加载中需要显示的文字
+            background: 'rgba(0,0,0,.7)' // 背景颜色
+          })
+        },
+        // 结束加载动画
+        endLoading () {
+          // clearTimeout(timer);
+          if (loading) {
+            loading.close()
+          }
+        }
+      },
+      computed: {
+        tableHeight () {
+    
+          return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
+    
+        },
+    
+        ...mapGetters(['clientHeight', 'iframeHeight'])
+      },
+      watch: {
+    
+      },
+      props: {
+    
+      }
+    }
+    </script>
+    <style lang="scss" scoped >
+    .g-main {
+      width: 100%;
+    }
+  
+    .m-search {
+      background: #ffffff;
+      border-radius: 4px;
+      padding: 30px 20px 5px;
+      box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+    }
+  
+    .item_width_1 {
+      width: 260px;
+    }
+  
+    .item_width_2 {
+      width: 495px;
+    }
+  
+    .m-table {
+      background: #ffffff;
+      box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+      border-radius: 4px;
+      margin-top: 15px;
+      padding: 23px 30px 10px;
+  
+      .table {
+        margin-top: 20px;
+      }
+    }
+  
+    .div_btn {
+      display: flex;
+      justify-content: space-between;
+    }
+  
+    .el-row {
+      /* margin-bottom: 20px; */
+      display: flex;
+      flex-wrap: wrap;
+      margin-top: 10px;
+      margin-right: 50px;
+    }
+  </style>
+    

src/views/modules/workSys/typeActivity/typeActivityadd.vue

@@ -0,0 +1,216 @@
+<template>
+    <div>
+  
+      <div class="dialog-h-content scroll-h">
+        <el-form ref="ref_form" :inline="true"  :rules="dataRule"
+          class="form">
+
+          <el-form-item label="活动类型" label-width="150px" style="display: block">
+            <div style="width: 500px">
+              <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
+                </el-input>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+  
+      <div class="div_btn">
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <!-- <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
+          定</el-button> -->
+          <el-button size="small" type="primary" @click="handleComfirm">确
+          定</el-button>
+      </div>
+    </div>
+  </template>
+    
+    <script>
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost } from '@/js/dai/request'
+    import Tinymce from '@c/tinymce2/index.vue'
+    import daiMap from "@/utils/dai-map";
+    // import UploadImage from './upload-image.vue'
+    import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+    
+    var map
+    var search
+    var markers
+    var infoWindowList
+    var geocoder // 新建一个正逆地址解析类
+    
+    let loading // 加载动画
+    export default {
+      data () {
+        return {
+          typeName: '',
+          marde:''
+    
+        }
+      },
+      components: { Tinymce,UploadImage },
+      mounted () {
+        // this.initMap()
+    
+      },
+    
+      methods: { 
+        async initForm(activityId){
+          console.log('activityIddetailShow',activityId)
+          if(activityId !== ''){
+            this.marde = 'edi'
+            this.id = activityId.id
+            this.typeName = activityId.typeName
+          }
+
+            
+        },
+        async handleComfirm () {
+          // this.btnDisable = true
+          setTimeout(() => {
+            // this.btnDisable = false
+          }, 100)
+            if (this.typeName === '') {
+              this.$message.error('活动类型不能为空')
+            }else {
+              this.addActivity()
+            }
+    
+        },
+        async addActivity () {
+          if (this.marde === 'edi') {
+            let url = '/actual/base/activityType/update'
+            let parmer = {
+              typeName: this.typeName,
+              enabled: 0,
+              // id: this.id
+            }
+            const { data, code, msg } = await requestPost(url, parmer)
+
+            if (code === 0) {
+              this.$message({
+                type: 'success',
+                message: '操作成功'
+              })
+              this.resetData()
+              this.$emit('dialogOk')
+              // this.btnDisable = false
+            } else {
+              // this.btnDisable = false
+              this.$message.error(msg)
+            }
+          }else{
+            let url = '/actual/base/activityType/save'
+            // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
+            let parmer = {
+              typeName: this.typeName,
+              enabled: 0
+            }
+
+            const { data, code, msg } = await requestPost(url, parmer)
+
+            if (code === 0) {
+              this.$message({
+                type: 'success',
+                message: '操作成功'
+              })
+              this.resetData()
+              this.$emit('dialogOk')
+              // this.btnDisable = false
+            } else {
+              // this.btnDisable = false
+              this.$message.error(msg)
+            }
+          }
+          
+    
+        },
+    
+        handleCancle () {
+    
+          this.resetData()
+          this.$emit('dialogCancle')
+    
+        },
+    
+        resetData () {
+          this.typeName = '',
+          this.marde = ''
+    
+        },
+        // 开启加载动画
+        startLoading () {
+          loading = Loading.service({
+            lock: true, // 是否锁定
+            text: '正在加载……', // 加载中需要显示的文字
+            background: 'rgba(0,0,0,.7)' // 背景颜色
+          })
+        },
+        // 结束加载动画
+        endLoading () {
+          // clearTimeout(timer);
+          if (loading) {
+            loading.close()
+          }
+        }
+      },
+      computed: {
+        dataRule () {
+          return {
+            small: [
+              { required: true, message: '活动类型不能为空', trigger: 'blur' }
+            ]
+          }
+        },
+    
+      },
+      props: {
+       
+      }
+    }
+    </script>
+    
+    
+    <style lang="scss" scoped >
+    @import "@/assets/scss/modules/visual/communityManageForm.scss";
+    </style>
+    <style  lang="scss" scoped>
+    .item_width_1 {
+      width: 560px;
+    
+      /deep/.tox .tox-dialog {
+        z-index: 20000;
+      }
+    }
+    .tinymce_view {
+      ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+      }
+    }
+    
+    .div_map {
+      position: relative;
+    }
+    .div_searchmap {
+      z-index: 5000;
+      position: absolute;
+      top: 5px;
+      left: 5px;
+    }
+    
+    .tinymce_view {
+      height: 400px;
+      overflow: auto;
+    }
+    .text_p {
+      margin: 0;
+      padding: 0 10px;
+      border: 1px solid #d9d9d9;
+      border-radius: 5px;
+      > p {
+        margin: 0;
+      }
+    }
+    </style>
+    
+    

src/views/modules/workSys/typeActivity/typeDetails.vue

@@ -0,0 +1,163 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
+
+                <el-form-item label="活动类型" label-width="150px" style="display: block">
+                    <div style="width: 500px">
+                        <span>{{ typeName }}</span>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+        </div>
+    </div>
+</template>
+    
+    <script>
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost } from '@/js/dai/request'
+    import Tinymce from '@c/tinymce2/index.vue'
+    import daiMap from "@/utils/dai-map";
+    // import UploadImage from './upload-image.vue'
+    import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+    
+    var map
+    var search
+    var markers
+    var infoWindowList
+    var geocoder // 新建一个正逆地址解析类
+    
+    let loading // 加载动画
+    export default {
+      data () {
+        return {
+          typeName: ''
+    
+        }
+      },
+      components: { Tinymce,UploadImage },
+      mounted () {
+        // this.initMap()
+    
+      },
+    
+      methods: { 
+          handleCancle() {
+
+              this.resetData()
+              this.$emit('dialogCancle')
+
+          },
+
+          resetData() {
+              this.typeName = '',
+                  this.marde = ''
+
+          },
+          async handleComfirm() {
+              // this.btnDisable = true
+            //   setTimeout(() => {
+            //       // this.btnDisable = false
+            //   }, 100)
+            //   if (this.typeName === '') {
+            //       this.$message.error('活动类型不能为空')
+            //   } else {
+            //       this.addActivity()
+            //   }
+
+          },
+          async initForm(activityId) {
+              this.typeName = activityId.typeName
+          },
+          handleComfirm() {
+            //   this.resetData()
+              this.$emit('dialogCancle')
+
+          },
+          resetData() {
+              this.typeName = ''
+
+          },
+        // 开启加载动画
+        startLoading () {
+          loading = Loading.service({
+            lock: true, // 是否锁定
+            text: '正在加载……', // 加载中需要显示的文字
+            background: 'rgba(0,0,0,.7)' // 背景颜色
+          })
+        },
+        // 结束加载动画
+        endLoading () {
+          // clearTimeout(timer);
+          if (loading) {
+            loading.close()
+          }
+        }
+      },
+      computed: {
+        dataRule () {
+          return {
+            small: [
+              { required: true, message: '活动类型不能为空', trigger: 'blur' }
+            ]
+          }
+        },
+    
+      },
+      props: {
+       
+      }
+    }
+    </script>
+    
+    
+    <style lang="scss" scoped >
+    @import "@/assets/scss/modules/visual/communityManageForm.scss";
+    </style>
+    <style  lang="scss" scoped>
+    .item_width_1 {
+      width: 560px;
+    
+      /deep/.tox .tox-dialog {
+        z-index: 20000;
+      }
+    }
+    .tinymce_view {
+      ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+      }
+    }
+    
+    .div_map {
+      position: relative;
+    }
+    .div_searchmap {
+      z-index: 5000;
+      position: absolute;
+      top: 5px;
+      left: 5px;
+    }
+    
+    .tinymce_view {
+      height: 400px;
+      overflow: auto;
+    }
+    .text_p {
+      margin: 0;
+      padding: 0 10px;
+      border: 1px solid #d9d9d9;
+      border-radius: 5px;
+      > p {
+        margin: 0;
+      }
+    }
+    </style>
+    
+    
+