From 739ac95197185e70935f524c562d2436509bcc81 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 26 Aug 2022 17:12:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/changedeath.vue      | 2 --
 src/views/modules/plugins/change/changerelocation.vue | 2 --
 src/views/modules/plugins/change/changewelfare.vue    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 7b691ab07..d82ec3e3c 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/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>
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 3a1343bb1..ca2d5d0dc 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/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>
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index 81374dfae..f25e3efa7 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/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>

From 692541dc075cf97a2f2febc5c19f7d1d2a5b0b2d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 29 Aug 2022 10:48:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/regionalParty/activitysForm.vue      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index a45a5b80b..cfbaf7386 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -238,6 +238,7 @@ export default {
       let _form = {
         unitName: '',
         serviceMatterList: [],
+        unitIdList: [],
         type: '',
         contact: '',
         contactMobile: '',
@@ -530,6 +531,7 @@ export default {
       this.formData = {
         unitName: '',
         serviceMatterList: [],
+        unitIdList: [],
         type: '',
         contact: '',
         contactMobile: '',

From dc3fb36a34f190b6a18f6cd4857d9eea5120adb9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 29 Aug 2022 10:50:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=89=E6=8B=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitysForm.vue           | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

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