diff --git a/src/views/modules/activity/group-add-or-update.vue b/src/views/modules/activity/group-add-or-update.vue
index 50d9f50..207aab0 100644
--- a/src/views/modules/activity/group-add-or-update.vue
+++ b/src/views/modules/activity/group-add-or-update.vue
@@ -4,72 +4,46 @@
           <el-form-item label="社群名称" prop="groupName">
           <el-input v-model="dataForm.groupName" placeholder="社群名称"></el-input>
       </el-form-item>
-          <el-form-item label="社群头像" prop="groupAvatar">
-          <el-input v-model="dataForm.groupAvatar" placeholder="社群头像"></el-input>
-      </el-form-item>
-          <el-form-item label="社群介绍" prop="groupIntroduction">
-          <el-input v-model="dataForm.groupIntroduction" placeholder="社群介绍"></el-input>
-      </el-form-item>
-          <el-form-item label="社群类别 0：党员群，1：自建群" prop="groupCategory">
-          <el-input v-model="dataForm.groupCategory" placeholder="社群类别 0：党员群，1：自建群"></el-input>
-      </el-form-item>
-          <el-form-item label="物业项目ID" prop="propertyProjectId">
-          <el-input v-model="dataForm.propertyProjectId" placeholder="物业项目ID"></el-input>
-      </el-form-item>
-          <el-form-item label="网格" prop="deptName">
-          <el-input v-model="dataForm.deptName" placeholder="网格"></el-input>
-      </el-form-item>
-          <el-form-item label="网格ID" prop="deptId">
-          <el-input v-model="dataForm.deptId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散" prop="state">
-          <el-input v-model="dataForm.state" placeholder="状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散"></el-input>
-      </el-form-item>
-          <el-form-item label="处理意见" prop="processingOpinions">
-          <el-input v-model="dataForm.processingOpinions" placeholder="处理意见"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门ID" prop="allDeptIds">
-          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门名称" prop="allDeptNames">
-          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门" prop="parentDeptIds">
-          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门" prop="parentDeptNames">
-          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="关联业务id 如:物业项目ID" prop="referenceBusinessId">
-          <el-input v-model="dataForm.referenceBusinessId" placeholder="关联业务id 如:物业项目ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所属版块编码" prop="sectionCode">
-          <el-input v-model="dataForm.sectionCode" placeholder="所属版块编码"></el-input>
-      </el-form-item>
-          <el-form-item label="社群类别编码" prop="categoryCode">
-          <el-input v-model="dataForm.categoryCode" placeholder="社群类别编码"></el-input>
-      </el-form-item>
-          <el-form-item label="社区部门类别" prop="typeKey">
-          <el-input v-model="dataForm.typeKey" placeholder="社区部门类别"></el-input>
-      </el-form-item>
+        <el-form-item label="社群头像"
+                      v-loading="loading"
+                      prop="groupAvatar">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :on-success="handleAvatarActSuccess"
+                       :on-error="handelError"
+                       :before-upload="beforeAvatarUpload">
+                <img v-if="dataForm.groupAvatar"
+                     :src="dataForm.groupAvatar"
+                     class="avatar">
+                <i v-else
+                   class="el-icon-plus avatar-uploader-icon"></i>
+                <div slot="tip"
+                     class="el-upload__tip">只能上传jpg/png文件，且不超过500kb
+                </div>
+            </el-upload>
+        </el-form-item>
+        <el-form-item label="所属类别："
+                      prop="groupCategory">
+            <el-select v-model="dataForm.groupCategory"
+                       placeholder="所属类别" style="width: 100%">
+                <el-option v-for="item in categoryOptions"
+                           :key="item.code"
+                           :label="item.name"
+                           :value="item.code">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="网格ID"
+                      prop="deptId">
+            <el-cascader v-model="dataForm.deptId" style="width: 100%"
+                         :options="options"
+                         :disabled="dataForm.id"
+                         ref="grid"
+                         @change="deptHandleChange"
+                         filterable
+                         collapse-tags></el-cascader>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -80,6 +54,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import Cookies from "js-cookie";
 export default {
   data () {
     return {
@@ -109,7 +84,11 @@ export default {
         sectionCode: '',
         categoryCode: '',
         typeKey: ''
-      }
+      },
+        categoryOptions: [],
+        options: [],
+        loading: false,
+        uploadUrl: ''
     }
   },
   computed: {
@@ -187,8 +166,16 @@ export default {
       }
     }
   },
+    created () {
+        this.$nextTick(() => {
+            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+        })
+    },
   methods: {
     init () {
+        // 获取下拉菜单
+        this.getByLoginUser()
+        this.getOptions()
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
@@ -209,6 +196,44 @@ export default {
         }
       }).catch(() => {})
     },
+      // 获取部门
+      getByLoginUser () {
+          this.$http
+              .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
+              .then(({ data: res }) => {
+                  if (res.code !== 0) {
+                      return this.$message.error(res.msg)
+                  }
+                  this.loading = false
+                  this.options = res.data.options
+              })
+              .catch(() => {
+                  this.loading = false
+              })
+      },
+      getOptions () {
+          this.$http
+              .get(`/property/sectioncategory/list`, { params: { sectionCode: 'interest_group' } }).then(({ data: res }) => {
+              if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+              }
+              this.categoryOptions = res.data
+          })
+              .catch(() => { })
+      },
+      deptHandleChange (value) {
+          this.dataForm.deptId = value.slice(-1).shift()
+      },
+      handleAvatarActSuccess (res, file) {
+          this.loading = false
+          this.dataForm.groupAvatar = res.data.url
+      },
+      beforeAvatarUpload (file) {
+          this.loading = true
+      },
+      handelError () {
+          this.loading = false
+      },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
@@ -234,3 +259,31 @@ export default {
   }
 }
 </script>
+<style scoped>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>