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

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

@@ -236,13 +236,17 @@ export default {
   data () {
     let initFormData = () => {
       let _form = {
-        unitName: '',
+        gridId: '',
+        serviceMatter: '',//服务事项
         serviceMatterList: [],
-        type: '',
+        unitId: '',//单位ID
-        contact: '',
+        unitIdList: [],
-        contactMobile: '',
+        title: '',//活动标题
-        memberCount: 0,
+        target: '',//活动目标
-        remark: '', //备注【最大500字】
+        content: '',//活动内容
+        activityTime: '',//活动时间
+        peopleCount: 0,//服务人数
+        result: '', //活动结果
         address: '', //详细地址
         longitude: this.$store.state.user.longitude, //经度
         latitude: this.$store.state.user.latitude//纬度
@@ -528,17 +532,22 @@ export default {
       this.activityId = ''
       this.keyWords = ''
       this.formData = {
-        unitName: '',
+        gridId: '',
+        serviceMatter: '',//服务事项
         serviceMatterList: [],
-        type: '',
+        unitId: '',//单位ID
-        contact: '',
+        unitIdList: [],
-        contactMobile: '',
+        title: '',//活动标题
-        memberCount: 0,
+        target: '',//活动目标
-        remark: '', //备注【最大500字】
+        content: '',//活动内容
+        activityTime: '',//活动时间
+        peopleCount: 0,//服务人数
+        result: '', //活动结果
         address: '', //详细地址
         longitude: this.$store.state.user.longitude, //经度
         latitude: this.$store.state.user.latitude//纬度
       }
+
     },
     // 开启加载动画
     startLoading () {

src/views/modules/plugins/change/changedeath.vue

@@ -1,5 +1,4 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentDeath} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
@@ -135,7 +134,6 @@
                    :gridName="lookInfo.gridName"
                    @close="handleCancleLook" />
     </div>
-  </el-card>
 </template>
 
 <script>

src/views/modules/plugins/change/changerelocation.vue

@@ -1,5 +1,4 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-change__changeRelocation} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
@@ -213,7 +212,6 @@
                    :gridName="lookInfo.gridName"
                    @close="handleCancleLook" />
     </div>
-  </el-card>
 </template>
 
 <script>

src/views/modules/plugins/change/changewelfare.vue

@@ -1,5 +1,4 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentDeath} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
@@ -132,7 +131,6 @@
       </span>
       </el-dialog>
     </div>
-  </el-card>
 </template>
 
 <script>