diff --git a/src/views/modules/custom/gridforceinfo-add-or-update.vue b/src/views/modules/custom/gridforceinfo-add-or-update.vue
new file mode 100755
index 00000000..5998057d
--- /dev/null
+++ b/src/views/modules/custom/gridforceinfo-add-or-update.vue
@@ -0,0 +1,212 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+      <el-form-item label="姓名" prop="realName">
+          <el-input v-model="dataForm.realName" placeholder="姓名" style="width: 300px;"></el-input>
+      </el-form-item>
+          <el-form-item label="性别" prop="sex">
+            <el-radio-group v-model="dataForm.sex">
+              <el-radio  label="1">男</el-radio>
+              <el-radio  label="0">女</el-radio>
+            </el-radio-group>
+      </el-form-item>
+          <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话" style="width: 300px;"></el-input>
+      </el-form-item>
+          <el-form-item label="身份证号码" prop="identityNo">
+          <el-input v-model="dataForm.identityNo" placeholder="身份证号码" style="width: 300px;"></el-input>
+      </el-form-item>
+      <template v-if="!dataForm.id">
+        <el-form-item label="所属社区" prop="deptId">
+          <el-cascader v-model="dataForm.deptId" :props="{ checkStrictly: true }" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.id">
+        <el-form-item label="所属社区" prop="allDeptIds">
+          <el-cascader v-model="dataForm.allDeptIds" :props="{ checkStrictly: true }" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <el-form-item label="头像" prop="faceImg">
+          <el-upload class="avatar-uploader"
+                      :action="uploadUrl"
+                      :show-file-list="false"
+                      :on-success="handleAvatarBannerSuccess"
+                      :on-error="handelError"
+                      :before-upload="beforeAvatarUpload">
+            <img v-if="dataForm.faceImg" :src="dataForm.faceImg" 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="workUnit">
+          <el-input v-model="dataForm.workUnit" placeholder="工作单位" style="width: 300px;"></el-input>
+      </el-form-item>
+      <el-form-item label="网格职责" prop="dutyCategoryId">
+        <el-select v-model="dataForm.dutyCategoryId" @change="changeCaterory" placeholder="请选择网络职责" style="width:220px">
+          <el-option v-for="item in dutyCategorys"
+                     :key="item.id"
+                     :label="item.dutyCategoryName"
+                     :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注" style="width: 300px;"></el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        realName: '',
+        sex: '',
+        mobile: '',
+        identityNo: '',
+        faceImg: '',
+        workUnit: '',
+        dutyCategoryId: '',
+        remark: '',
+        deptId: '',
+        allDeptIds: []
+      },
+      loading: false,
+      options: [],
+      uploadUrl: '',
+      dutyCategorys: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        realName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        // identityNo: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        faceImg: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        workUnit: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        dutyCategoryId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.$nextTick(() => {
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    })
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getOptions()
+      this.getListCategory()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取部门列表
+    getOptions () {
+      this.$http.get(`/api/admin/dept/getAllDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data
+        })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/custom/gridForceinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.dataForm.allDeptIds = res.data.selectedDeptIds
+      }).catch(() => {})
+    },
+    changeCaterory () {
+      let choosenItem = this.dutyCategorys.filter(item => item.id === this.dataForm.dutyCategoryId)[0]
+      this.dataForm.dutyCategoryId = choosenItem.id
+    },
+    getListCategory () {
+      this.$http.get(`/custom/gridoperatordutycategory/getAllDutyCat`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dutyCategorys = res.data
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (this.dataForm.deptId) {
+          this.dataForm.deptId = this.dataForm.deptId[this.dataForm.deptId.length - 1]
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/custom/gridForceinfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    handleAvatarBannerSuccess (res, file) {
+      this.loading = false
+      this.dataForm.faceImg = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/custom/gridforceinfo-detail.vue b/src/views/modules/custom/gridforceinfo-detail.vue
new file mode 100755
index 00000000..859156fb
--- /dev/null
+++ b/src/views/modules/custom/gridforceinfo-detail.vue
@@ -0,0 +1,197 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="查看"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="姓名"
+                    prop="realName"
+                    v-if="dataForm.realName">
+        <span>{{dataForm.realName}}</span>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex" v-if="dataForm.sex">
+        <span>{{dataForm.sex === '0'?'女':'男'}}</span>
+      </el-form-item>
+      <el-form-item label="身份证号" prop="identityNo" v-if="dataForm.identityNo">
+        <span>{{dataForm.identityNo}}</span>
+      </el-form-item>
+      <el-form-item label="手机号码" prop="mobile" v-if="dataForm.mobile">
+        <span>{{dataForm.mobile}}</span>
+      </el-form-item>
+      <el-form-item label="所属网格" prop="allDeptNames" v-if="dataForm.allDeptNames">
+        <span>{{dataForm.allDeptNames}}</span>
+      </el-form-item>
+      <el-form-item label="网络职责" prop="dutyCategoryId">
+        <span>{{changeCatergory()}}</span>
+      </el-form-item>
+      <el-form-item label="排序" prop="sort" v-if="dataForm.sort">
+        <span>{{dataForm.sort}}</span>
+      </el-form-item>
+      <el-form-item label="工作单位" prop="workUnit" v-if="dataForm.workUnit">
+        <span>{{dataForm.workUnit}}</span>
+      </el-form-item>
+      <el-form-item label="备注"
+                    prop="remark"
+                    v-if="dataForm.remark">
+        <span>{{dataForm.remark}}</span>
+      </el-form-item>
+      <el-form-item label="头像"
+                    v-loading="loading"
+                    prop="faceImg"
+                    v-if="dataForm.mobile">
+        <img v-if="dataForm.faceImg"
+             :src="dataForm.faceImg"
+             class="avatar">
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false"
+                 type="primary">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        realName: '',
+        sex: '',
+        sort: '',
+        mobile: '',
+        identityNo: '',
+        faceImg: '',
+        workUnit: '',
+        dutyCategoryId: '',
+        showFlag: '',
+        remark: '',
+        selectedDeptIds: []
+      },
+      sexFlagArr: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ],
+      loading: false,
+      uploadUrl: '',
+      options: [],
+      dutyCategoryName: '',
+      dutyCategorys: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+      }
+    }
+  },
+  created () {
+    this.getListCategory()
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.allDeptIds = []
+        }
+      })
+      this.getByLoginUser()
+      this.getDutyCategory()
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/custom/gridForceinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/custom/gridForceinfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    // 上传图片
+    handleAvatarSuccess (res, file) {
+      this.dataForm.faceImg = res.data.url
+      this.loading = false
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    },
+    getByLoginUser () {
+      this.$http
+        .get(`/api/admin/dept/getAllDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data
+        })
+        .catch(() => { })
+    },
+    getDutyCategory () {
+      this.$http
+        .get(`/sys/dept/party/getDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    },
+    getListCategory () {
+      this.$http.get(`/custom/gridoperatordutycategory/getAllDutyCat`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dutyCategorys = res.data
+      }).catch(() => { })
+    },
+    changeCatergory () {
+      let choosenItem = this.dutyCategorys.filter(item => item.id === this.dataForm.dutyCategoryId)[0]
+      if (choosenItem !== undefined) {
+        return choosenItem.dutyCategoryName
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/custom/gridforceinfo.vue b/src/views/modules/custom/gridforceinfo.vue
new file mode 100755
index 00000000..c608a0d7
--- /dev/null
+++ b/src/views/modules/custom/gridforceinfo.vue
@@ -0,0 +1,158 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-__gridforceinfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" filterable clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('custom:gridforceinfo:save')" type="primary" @click="addOrUpdateHandle()" class="custom-button-add">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('custom:gridforceinfo:delete')" type="danger" @click="deleteHandle()" class="custom-button-delete">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="realName" label="姓名" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat" width="50"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" min-width="200" show-overflow-tooltip
+         ></el-table-column>
+        <el-table-column prop="dutyCategoryId" label="网格职责" header-align="center" align="center" :formatter="dutyCategoryFormat" width="150"></el-table-column>
+        <el-table-column prop="workUnit" label="工作单位" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="220">
+          <template slot-scope="scope">
+            <!-- <el-button type="text"
+                       size="small"
+                       class="custom-table-button-default"
+                       @click="gridForceDetailHandle(scope.row.id)">查看</el-button> -->
+            <el-button v-if="$hasPermission('custom:gridforceinfo:update')" type="text" size="small" class="custom-table-button-modify" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('custom:gridforceinfo:delete')" type="text" size="small" class="custom-table-button-delete" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <gridforceinfo-detail v-if="gridForceInfoDetailStatus" ref="gridforceinfoDetail" @refreshDataList="getDataList"></gridforceinfo-detail>
+
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './gridforceinfo-add-or-update'
+import GridForceinfoDetail from './gridforceinfo-detail'
+
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/custom/gridForceinfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/custom/gridForceinfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        deptId: ''
+      },
+      ids: [],
+      options: [],
+      gridForceInfoDetailStatus: false,
+      dutyCategorys: []
+    }
+  },
+  components: {
+    AddOrUpdate,
+    GridForceinfoDetail
+  },
+  created: function () {
+    this.getOptions()
+    this.getListCategory()
+  },
+  watch: {
+    'ids': function (val) {
+      if (val.length === 0 || val.length === 1) {
+        this.dataForm.deptId = val[0]
+      }
+      if (val.length === 2) {
+        this.dataForm.deptId = val[1]
+      }
+      if (val.length === 3) {
+        this.dataForm.deptId = val[2]
+      }
+      if (val.length === 4) {
+        this.dataForm.deptId = val[3]
+      }
+      if (val.length === 5) {
+        this.dataForm.deptId = val[4]
+      }
+    }
+  },
+  methods: {
+    getOptions () {
+      this.$http.get(`/api/admin/dept/getAllDeptTree`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data
+      }).catch(() => { })
+    },
+    showFlagFormat (row, column) {
+      if (row.sex === '0') {
+        return '女'
+      } else {
+        return '男'
+      }
+    },
+    gridForceDetailHandle (id) {
+      this.gridForceInfoDetailStatus = true
+      this.$nextTick(() => {
+        this.$refs.gridforceinfoDetail.dataForm.id = id
+        this.$refs.gridforceinfoDetail.init()
+      })
+    },
+    active_text (value, row) {
+      this.$http.post(`/custom/gridForceinfo/changeShowFlag`, row).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      }).catch(() => { })
+    },
+    getListCategory () {
+      this.$http.get(`/custom/gridoperatordutycategory/getAllDutyCat`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dutyCategorys = res.data
+      }).catch(() => { })
+    },
+    dutyCategoryFormat (row) {
+      let choosenItem = this.dutyCategorys.filter(item => item.id === row.dutyCategoryId)[0]
+      if (choosenItem !== undefined) {
+        return choosenItem.dutyCategoryName
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/style/gridstyle-add-or-update.vue b/src/views/modules/style/gridstyle-add-or-update.vue
new file mode 100755
index 00000000..f146c72a
--- /dev/null
+++ b/src/views/modules/style/gridstyle-add-or-update.vue
@@ -0,0 +1,262 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-row>
+          <el-form-item label="所属机构">
+            <el-cascader v-model="dataForm.allDeptIds" :options="options"
+                         :props="{ checkStrictly: true }" clearable collapse-tags></el-cascader>
+          </el-form-item>
+      </el-row>
+      <el-form-item label="标题" prop="title">
+          <el-input v-model="dataForm.title" placeholder="标题"></el-input>
+      </el-form-item>
+      <el-row>
+        <el-form-item label="封面图片" v-loading="loading" prop="headerPhoto">
+          <el-upload class="avatar-uploader"
+                      :action="uploadUrl"
+                      :show-file-list="false"
+                      :on-success="handleAvatarBannerSuccess"
+                      :on-error="handelError"
+                      :before-upload="beforeAvatarUpload">
+            <img v-if="dataForm.headerPhoto" :src="dataForm.headerPhoto" 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-row>
+      <el-row>
+        <el-form-item prop="content" label="正文编辑">
+          <!-- 富文本编辑器, 容器 -->
+          <div id="J_quillEditor"></div>
+          <!-- 自定义上传图片功能 (使用element upload组件) -->
+          <el-upload :action="uploadUrl" :show-file-list="false" :before-upload="uploadBeforeUploadHandle"
+                      :on-success="uploadSuccessHandle" style="display: none;">
+            <el-button ref="uploadBtn" type="primary" size="small">{{ $t('upload.button') }}</el-button>
+          </el-upload>
+        </el-form-item>
+      </el-row>
+      <el-form-item label="活动地址" prop="address">
+          <el-input v-model="dataForm.address" placeholder="活动地址"></el-input>
+      </el-form-item>
+      <el-form-item label="活动时间" prop="date">
+                <el-date-picker
+                      v-model="dataForm.date"
+                      type="date"
+                      placeholder="活动时间"
+                      label-width="150px"
+                      value-format="yyyy-MM-dd"
+                      format="yyyy-MM-dd"
+                      style="width:200px">
+              </el-date-picker>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+import 'quill/dist/quill.snow.css'
+import Quill from 'quill'
+export default {
+  data () {
+    return {
+      visible: false,
+      loading: false,
+      dataForm: {
+        id: '',
+        title: '',
+        content: '',
+        headerPhoto: '',
+        address: '',
+        date: '',
+        deptId: '',
+        allDeptIds: []
+      },
+      options: [],
+      // 富文本
+      quillEditor: null,
+      quillEditorToolbarOptions: [
+        ['bold', 'italic', 'underline', 'strike'],
+        ['blockquote', 'code-block', 'image'],
+        [{ 'header': 1 }, { 'header': 2 }],
+        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+        [{ 'script': 'sub' }, { 'script': 'super' }],
+        [{ 'indent': '-1' }, { 'indent': '+1' }],
+        [{ 'direction': 'rtl' }],
+        [{ 'size': ['small', false, 'large', 'huge'] }],
+        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+        [{ 'color': [] }, { 'background': [] }],
+        [{ 'font': [] }],
+        [{ 'align': [] }],
+        ['clean']
+      ],
+      uploadUrl: '',
+      // 富文本end
+      fileList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        title: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        headerPhoto: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        date: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.$nextTick(() => {
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    })
+    this.visible = true
+    this.$nextTick(() => {
+      // 富文本
+      this.hideUpload = false
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+      if (this.quillEditor) {
+        this.quillEditor.deleteText(0, this.quillEditor.getLength())
+      } else {
+        this.quillEditorHandle()
+      }
+      // 富文本end
+    })
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getOptions()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.allDeptIds = []
+          this.dataForm.deptId = ''
+          this.dataForm.content = ''
+          this.quillEditor.root.innerHTML = ''
+          this.quillEditorToolbarOptions = [
+            ['bold', 'italic', 'underline', 'strike'],
+            ['blockquote', 'code-block', 'image'],
+            [{ 'header': 1 }, { 'header': 2 }],
+            [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+            [{ 'script': 'sub' }, { 'script': 'super' }],
+            [{ 'indent': '-1' }, { 'indent': '+1' }],
+            [{ 'direction': 'rtl' }],
+            [{ 'size': ['small', false, 'large', 'huge'] }],
+            [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+            [{ 'color': [] }, { 'background': [] }],
+            [{ 'font': [] }],
+            [{ 'align': [] }],
+            ['clean']
+          ]
+        }
+      })
+    },
+    // 获取部门列表
+    getOptions () {
+      this.$http.get(`/api/admin/dept/getAllDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data
+        })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/sys/gridstyle/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.quillEditor.root.innerHTML = this.dataForm.content
+      }).catch(() => {})
+    },
+    // 富文本编辑器
+    quillEditorHandle () {
+      this.quillEditor = new Quill('#J_quillEditor', {
+        modules: {
+          toolbar: this.quillEditorToolbarOptions
+        },
+        theme: 'snow'
+      })
+      this.quillEditor.container.style.height = `${300}px`
+      // // 自定义上传图片功能 (使用element upload组件)
+      this.quillEditor.getModule('toolbar').addHandler('image', () => {
+        this.$refs.uploadBtn.$el.click()
+      })
+      // 监听内容变化，动态赋值
+      this.quillEditor.on('text-change', () => {
+        this.dataForm.content = this.quillEditor.root.innerHTML
+      })
+    },
+    // 上传图片之前 (富文本)
+    uploadBeforeUploadHandle (file) {
+      if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
+        this.$message.error(this.$t('upload.tip', { 'format': 'jpg、png、gif' }))
+        return false
+      }
+    },
+    // 上传图片成功 (富文本)
+    uploadSuccessHandle (res, file, fileList) {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      console.log(res.data)
+      this.quillEditor.insertEmbed(this.quillEditor.getSelection().index, 'image', res.data.url)
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/gridstyle/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    handleAvatarBannerSuccess (res, file) {
+      this.loading = false
+      this.dataForm.headerPhoto = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/style/gridstyle.vue b/src/views/modules/style/gridstyle.vue
new file mode 100755
index 00000000..86f35fad
--- /dev/null
+++ b/src/views/modules/style/gridstyle.vue
@@ -0,0 +1,79 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__gridstyle}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.title" placeholder="标题" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':gridstyle:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':gridstyle:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="title" label="活动标题" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="content" label="活动内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="headerPhoto" label="封面图片" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="address" label="活动地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="date" label="活动时间" header-align="center" align="center" :formatter="formatDate"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':gridstyle:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':gridstyle:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './gridstyle-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/sys/gridstyle/page',
+        getDataListIsPage: true,
+        deleteURL: '/sys/gridstyle',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    formatDate (row, column) {
+      let data = row[column.property]
+      if (data == null) {
+        return null
+      }
+      let dt = new Date(data)
+      return dt.getFullYear() + '-' + ((dt.getMonth() + 1) < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1) + '-' + dt.getDate()
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/style/voluntarystyle-add-or-update.vue b/src/views/modules/style/voluntarystyle-add-or-update.vue
new file mode 100755
index 00000000..9e4fcea1
--- /dev/null
+++ b/src/views/modules/style/voluntarystyle-add-or-update.vue
@@ -0,0 +1,262 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-row>
+          <el-form-item label="所属机构">
+            <el-cascader v-model="dataForm.allDeptIds" :options="options"
+                         :props="{ checkStrictly: true }" clearable collapse-tags></el-cascader>
+          </el-form-item>
+      </el-row>
+      <el-form-item label="标题" prop="title">
+          <el-input v-model="dataForm.title" placeholder="标题"></el-input>
+      </el-form-item>
+      <el-row>
+        <el-form-item label="封面图片" v-loading="loading" prop="headerPhoto">
+          <el-upload class="avatar-uploader"
+                      :action="uploadUrl"
+                      :show-file-list="false"
+                      :on-success="handleAvatarBannerSuccess"
+                      :on-error="handelError"
+                      :before-upload="beforeAvatarUpload">
+            <img v-if="dataForm.headerPhoto" :src="dataForm.headerPhoto" 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-row>
+      <el-row>
+        <el-form-item prop="content" label="正文编辑">
+          <!-- 富文本编辑器, 容器 -->
+          <div id="J_quillEditor"></div>
+          <!-- 自定义上传图片功能 (使用element upload组件) -->
+          <el-upload :action="uploadUrl" :show-file-list="false" :before-upload="uploadBeforeUploadHandle"
+                      :on-success="uploadSuccessHandle" style="display: none;">
+            <el-button ref="uploadBtn" type="primary" size="small">{{ $t('upload.button') }}</el-button>
+          </el-upload>
+        </el-form-item>
+      </el-row>
+      <el-form-item label="活动地址" prop="address">
+          <el-input v-model="dataForm.address" placeholder="活动地址"></el-input>
+      </el-form-item>
+      <el-form-item label="活动时间" prop="date">
+                <el-date-picker
+                      v-model="dataForm.date"
+                      type="date"
+                      placeholder="活动时间"
+                      label-width="150px"
+                      value-format="yyyy-MM-dd"
+                      format="yyyy-MM-dd"
+                      style="width:200px">
+              </el-date-picker>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+import 'quill/dist/quill.snow.css'
+import Quill from 'quill'
+export default {
+  data () {
+    return {
+      visible: false,
+      loading: false,
+      dataForm: {
+        id: '',
+        title: '',
+        content: '',
+        headerPhoto: '',
+        address: '',
+        date: '',
+        deptId: '',
+        allDeptIds: []
+      },
+      options: [],
+      // 富文本
+      quillEditor: null,
+      quillEditorToolbarOptions: [
+        ['bold', 'italic', 'underline', 'strike'],
+        ['blockquote', 'code-block', 'image'],
+        [{ 'header': 1 }, { 'header': 2 }],
+        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+        [{ 'script': 'sub' }, { 'script': 'super' }],
+        [{ 'indent': '-1' }, { 'indent': '+1' }],
+        [{ 'direction': 'rtl' }],
+        [{ 'size': ['small', false, 'large', 'huge'] }],
+        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+        [{ 'color': [] }, { 'background': [] }],
+        [{ 'font': [] }],
+        [{ 'align': [] }],
+        ['clean']
+      ],
+      uploadUrl: '',
+      // 富文本end
+      fileList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        title: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        headerPhoto: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        date: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.$nextTick(() => {
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    })
+    this.visible = true
+    this.$nextTick(() => {
+      // 富文本
+      this.hideUpload = false
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+      if (this.quillEditor) {
+        this.quillEditor.deleteText(0, this.quillEditor.getLength())
+      } else {
+        this.quillEditorHandle()
+      }
+      // 富文本end
+    })
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getOptions()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.allDeptIds = []
+          this.dataForm.deptId = ''
+          this.dataForm.content = ''
+          this.quillEditor.root.innerHTML = ''
+          this.quillEditorToolbarOptions = [
+            ['bold', 'italic', 'underline', 'strike'],
+            ['blockquote', 'code-block', 'image'],
+            [{ 'header': 1 }, { 'header': 2 }],
+            [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+            [{ 'script': 'sub' }, { 'script': 'super' }],
+            [{ 'indent': '-1' }, { 'indent': '+1' }],
+            [{ 'direction': 'rtl' }],
+            [{ 'size': ['small', false, 'large', 'huge'] }],
+            [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+            [{ 'color': [] }, { 'background': [] }],
+            [{ 'font': [] }],
+            [{ 'align': [] }],
+            ['clean']
+          ]
+        }
+      })
+    },
+    // 获取部门列表
+    getOptions () {
+      this.$http
+        .get(`/api/admin/dept/getAllDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data
+        })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/sys/voluntarystyle/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.quillEditor.root.innerHTML = this.dataForm.content
+      }).catch(() => {})
+    },
+    // 富文本编辑器
+    quillEditorHandle () {
+      this.quillEditor = new Quill('#J_quillEditor', {
+        modules: {
+          toolbar: this.quillEditorToolbarOptions
+        },
+        theme: 'snow'
+      })
+      this.quillEditor.container.style.height = `${300}px`
+      // // 自定义上传图片功能 (使用element upload组件)
+      this.quillEditor.getModule('toolbar').addHandler('image', () => {
+        this.$refs.uploadBtn.$el.click()
+      })
+      // 监听内容变化，动态赋值
+      this.quillEditor.on('text-change', () => {
+        this.dataForm.content = this.quillEditor.root.innerHTML
+      })
+    },
+    // 上传图片之前 (富文本)
+    uploadBeforeUploadHandle (file) {
+      if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
+        this.$message.error(this.$t('upload.tip', { 'format': 'jpg、png、gif' }))
+        return false
+      }
+    },
+    // 上传图片成功 (富文本)
+    uploadSuccessHandle (res, file, fileList) {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.quillEditor.insertEmbed(this.quillEditor.getSelection().index, 'image', res.data.url)
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/voluntarystyle/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    handleAvatarBannerSuccess (res, file) {
+      this.loading = false
+      this.dataForm.headerPhoto = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/style/voluntarystyle.vue b/src/views/modules/style/voluntarystyle.vue
new file mode 100755
index 00000000..9bfc1c8d
--- /dev/null
+++ b/src/views/modules/style/voluntarystyle.vue
@@ -0,0 +1,79 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__voluntarystyle}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.title" placeholder="标题" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':voluntarystyle:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':voluntarystyle:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="title" label="活动标题" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="content" label="活动内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="headerPhoto" label="封面图片" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="address" label="活动地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="date" label="活动时间" header-align="center" align="center" :formatter="formatDate"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':voluntarystyle:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':voluntarystyle:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './voluntarystyle-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/sys/voluntarystyle/page',
+        getDataListIsPage: true,
+        deleteURL: '/sys/voluntarystyle',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    formatDate (row, column) {
+      let data = row[column.property]
+      if (data == null) {
+        return null
+      }
+      let dt = new Date(data)
+      return dt.getFullYear() + '-' + ((dt.getMonth() + 1) < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1) + '-' + dt.getDate()
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/activityparty-add-or-update.vue b/src/views/modules/user/activityparty-add-or-update.vue
new file mode 100755
index 00000000..736836ed
--- /dev/null
+++ b/src/views/modules/user/activityparty-add-or-update.vue
@@ -0,0 +1,208 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+      <el-form-item label="活动名称" prop="title">
+          <el-input v-model="dataForm.title" placeholder="活动名称"></el-input>
+      </el-form-item>
+      <el-form-item label="活动内容" prop="content">
+          <el-input type="textarea" v-model="dataForm.content" placeholder="活动内容" style="width: 80%;"></el-input>
+      </el-form-item>
+      <el-row>
+          <el-col :span="12">
+            <el-form-item label="活动开始时间" prop="startDate">
+                <el-date-picker
+                      v-model="dataForm.startDate"
+                      type="date"
+                      placeholder="活动开始时间"
+                      label-width="150px"
+                      value-format="yyyy-MM-dd"
+                      format="yyyy-MM-dd"
+                      style="width:200px">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="活动结束时间" prop="endDate">
+                <el-date-picker
+                      v-model="dataForm.endDate"
+                      type="date"
+                      placeholder="活动结束时间"
+                      label-width="150px"
+                      value-format="yyyy-MM-dd"
+                      format="yyyy-MM-dd"
+                      style="width:200px">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+      </el-row>
+      <el-form-item label="活动地址" prop="address">
+          <el-input v-model="dataForm.address" placeholder="活动地址"></el-input>
+      </el-form-item>
+      <el-form-item label="参加人员" prop="reportPartyIds">
+          <el-select v-model="dataForm.reportPartyIds" multiple>
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"
+                :v-model="dataForm.reportPartyIds">
+              </el-option>
+          </el-select>
+      </el-form-item>
+      <el-row>
+          <el-form-item label="活动图片" v-loading="loading" prop="imgs">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :on-success="handleAvatarBannerSuccess"
+                       :on-error="handelError"
+                       :before-upload="beforeAvatarUpload">
+              <img v-if="dataForm.imgs" :src="dataForm.imgs" 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-row>
+      <!-- <el-form-item label="活动图片" prop="imgs">
+          <el-input v-model="dataForm.imgs" placeholder="活动图片"></el-input>
+      </el-form-item> -->
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        reportPartyIds: [],
+        title: '',
+        content: '',
+        startDate: '',
+        endDate: '',
+        address: '',
+        imgs: ''
+      },
+      loading: false,
+      options: [],
+      uploadUrl: ''
+    }
+  },
+  created () {
+    this.$nextTick(() => {
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+      console.log(this.uploadUrl)
+    })
+  },
+  computed: {
+    dataRule () {
+      return {
+        reportPartyIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        title: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        startDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        endDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getByLoginUser()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.reportPartyIds = []
+        }
+      })
+    },
+    getByLoginUser () {
+      this.$http
+        .get(`/app-user/reportparty/page`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.list
+        })
+        .catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/activityparty/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/activityparty/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    handleAvatarBannerSuccess (res, file) {
+      this.loading = false
+      this.dataForm.imgs = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    }
+  }
+}
+</script>
+<style textarea="javascript">
+.el-input {
+  width: 81% !important;
+}
+
+.el-col-12 {
+  width: 45% !important;
+}
+
+.el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/views/modules/user/activityparty.vue b/src/views/modules/user/activityparty.vue
new file mode 100755
index 00000000..95f611d2
--- /dev/null
+++ b/src/views/modules/user/activityparty.vue
@@ -0,0 +1,69 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__activityparty}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.title" placeholder="活动标题" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="title" label="活动标题" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="content" label="活动内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="address" label="活动地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startDate" label="活动开始时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="endDate" label="活动结束时间" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './activityparty-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/activityparty/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/activityparty',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/user/centralhousehold-add-or-update.vue b/src/views/modules/user/centralhousehold-add-or-update.vue
new file mode 100755
index 00000000..ff0c509d
--- /dev/null
+++ b/src/views/modules/user/centralhousehold-add-or-update.vue
@@ -0,0 +1,151 @@
+<template>
+    <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('审核')" :close-on-click-modal="false"
+        :close-on-press-escape="false">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+            :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+            <el-form-item label="申请人" prop="userId">
+                <el-input v-model="dataForm.realName" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="审核状态" prop="status">
+                <el-select v-model="dataForm.pass" disabled>
+                    <el-option v-for="item in passOptions" :key="item.value" :label="item.label" :value="item.value"
+                        :v-model="dataForm.pass">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="人员类别" prop="personnelCategory">
+                <el-input v-model="dataForm.personnelCategory" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="居住地址" prop="homeAddr">
+                <el-input v-model="dataForm.homeAddr" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="服务类型" prop="serviceType">
+                <el-input v-model="dataForm.serviceType" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="服务范围" prop="serviceScope">
+                <el-input v-model="dataForm.serviceScope" disabled></el-input>
+            </el-form-item>
+        </el-form>
+        <template slot="footer">
+            <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+            <el-button type="primary" @click="examine()">{{ $t(dataForm.pass === 0 ? '审核' : '驳回') }}</el-button>
+            <!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+    data() {
+        return {
+            visible: false,
+            dataForm: {
+                id: '',
+                pass: '',
+                personnelCategory: '',
+                homeAddr: '',
+                serviceType: '',
+                serviceScope: ''
+            },
+            passOptions: [
+                {
+                    value: 0,
+                    label: '未审核'
+                }, {
+                    value: 1,
+                    label: '已审核'
+                }
+            ]
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                pass: [
+                    { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+                ],
+                personnelCategory: [
+                    { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+                ],
+                homeAddr: [
+                    { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+                ],
+                serviceType: [
+                    { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+                ],
+                serviceScope: [
+                    { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+                ]
+            }
+        }
+    },
+    methods: {
+        init() {
+            this.visible = true
+            this.$nextTick(() => {
+                this.$refs['dataForm'].resetFields()
+                if (this.dataForm.id) {
+                    this.getInfo()
+                }
+            })
+        },
+        // 获取信息
+        getInfo() {
+            this.$http.get(`/app-user/centralhousehold/${this.dataForm.id}`).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                this.dataForm = {
+                    ...this.dataForm,
+                    ...res.data
+                }
+            }).catch(() => { })
+        },
+        // 表单提交
+        dataFormSubmitHandle: debounce(function () {
+            this.$refs['dataForm'].validate((valid) => {
+                if (!valid) {
+                    return false
+                }
+                this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/centralhousehold/', this.dataForm).then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    this.$message({
+                        message: this.$t('prompt.success'),
+                        type: 'success',
+                        duration: 500,
+                        onClose: () => {
+                            this.visible = false
+                            this.$emit('refreshDataList')
+                        }
+                    })
+                }).catch(() => { })
+            })
+        }, 1000, { 'leading': true, 'trailing': false }),
+        // 审核驳回
+        examine() {
+            const falg = this.dataForm.pass === 0 ? 1 : 0;
+            const data = {
+                id: this.dataForm.id,
+                pass: falg
+            }
+            this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/centralhousehold/', data).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                this.$message({
+                    message: this.$t('prompt.success'),
+                    type: 'success',
+                    duration: 500,
+                    onClose: () => {
+                        this.visible = false
+                        this.$emit('refreshDataList')
+                    }
+                })
+            }).catch(() => { })
+        }
+    }
+}
+</script>
diff --git a/src/views/modules/user/centralhousehold.vue b/src/views/modules/user/centralhousehold.vue
new file mode 100755
index 00000000..5ebfccfc
--- /dev/null
+++ b/src/views/modules/user/centralhousehold.vue
@@ -0,0 +1,109 @@
+<template>
+    <el-card shadow="never" class="aui-card--fill">
+        <div class="mod-__centralhousehold}">
+            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+                <el-form-item label="申请人" label-width="70px">
+                    <el-input v-model="dataForm.name" placeholder="请输入申请人姓名" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" label-width="70px">
+                    <el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="审核状态" label-width="70px">
+                    <el-select v-model="dataForm.pass" placeholder="请选择" clearable>
+                        <el-option v-for="item in passOptions" :key="item.value" :label="item.label" :value="item.value"
+                            :v-model="dataForm.pass">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+                </el-form-item>
+                <!-- <el-form-item>
+                    <el-button v-if="$hasPermission(':centralhousehold:save')" type="primary"
+                        @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button v-if="$hasPermission(':centralhousehold:delete')" type="danger"
+                        @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+                </el-form-item> -->
+            </el-form>
+            <el-table v-loading="dataListLoading" :data="dataList" border
+                @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+                <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+                <el-table-column prop="realName" label="申请人" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="pass" label="审核状态" header-align="center" align="center"
+                    :formatter="formatStatus"></el-table-column>
+                <el-table-column prop="personnelCategory" label="人员类别" header-align="center"
+                    align="center"></el-table-column>
+                <el-table-column prop="homeAddr" label="居住地址" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="serviceType" label="意向服务类型" header-align="center"
+                    align="center"></el-table-column>
+                <el-table-column prop="serviceScope" label="服务范围" header-align="center"
+                    align="center"></el-table-column>
+                <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"
+                            class="custom-table-button-default">查看</el-button>
+                        <!-- <el-button @click="examine(scope.row)" type="text" size="small">审核</el-button> -->
+                        <el-button v-if="$hasPermission(':centralhousehold:update')" type="text" size="small"
+                            @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+                        <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete')
+                            }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+                layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
+                @current-change="pageCurrentChangeHandle">
+            </el-pagination>
+            <!-- 弹窗, 新增 / 修改 -->
+            <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        </div>
+    </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './centralhousehold-add-or-update'
+export default {
+    mixins: [mixinViewModule],
+    data() {
+        return {
+            mixinViewModuleOptions: {
+                getDataListURL: '/app-user/centralhousehold/page',
+                getDataListIsPage: true,
+                deleteURL: '/app-user/centralhousehold',
+                deleteIsBatch: true
+            },
+            dataForm: {
+                id: '',
+                name: '',
+                mobile: '',
+                pass: ''
+            },
+            passOptions: [
+                {
+                    value: 0,
+                    label: '未审核'
+                }, {
+                    value: 1,
+                    label: '已审核'
+                }
+            ]
+        }
+    },
+    components: {
+        AddOrUpdate
+    },
+    methods: {
+        formatStatus(row) {
+            if (row.pass === 0) {
+                return '未审核'
+            } else {
+                return '已审核'
+            }
+        }
+    }
+}
+</script>
diff --git a/src/views/modules/user/flowparty-add-or-update.vue b/src/views/modules/user/flowparty-add-or-update.vue
new file mode 100755
index 00000000..ca9a06de
--- /dev/null
+++ b/src/views/modules/user/flowparty-add-or-update.vue
@@ -0,0 +1,188 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="证件号码" prop="idCard">
+        <el-input v-model="dataForm.idCard" placeholder="证件号码"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile">
+        <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+      </el-form-item>
+      <el-form-item label="自由职业者" prop="freelance">
+        <el-select v-model="dataForm.freelance">
+          <el-option v-for="item in freelanceOptions" :key="item.value" :label="item.label" :value="item.value"
+            :v-model="dataForm.freelance">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否党员" prop="party">
+        <el-select v-model="dataForm.party">
+          <el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
+            :v-model="dataForm.party">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="现属党支部" prop="partyName">
+        <el-input v-model="dataForm.partyName" placeholder="现属党支部名称"></el-input>
+      </el-form-item>
+      <template v-if="dataForm.freelance == 0">
+        <el-form-item label="现工作单位" prop="workUnit">
+          <el-input v-model="dataForm.workUnit" placeholder="工作单位名称"></el-input>
+        </el-form-item>
+        <el-form-item label="单位地址" prop="workAddr">
+          <el-input v-model="dataForm.workAddr" placeholder="单位地址"></el-input>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.freelance == 1">
+        <el-form-item label="联系地址" prop="workAddr">
+          <el-input v-model="dataForm.workAddr" placeholder="联系地址"></el-input>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.id == ''">
+        <el-form-item label="所属社区" prop="deptId">
+          <el-cascader v-model="dataForm.deptId" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.id != ''">
+        <el-form-item label="所属社区" prop="allDeptIds">
+          <el-cascader v-model="dataForm.allDeptIds" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="dataForm.status">
+          <el-option v-for="item in freelanceOptions" :key="item.value" :label="item.label" :value="item.value"
+            :v-model="dataForm.status">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <template v-if="dataForm.status === 1">
+        <el-form-item label="审核意见" prop="examineMsg">
+          <el-input type="textarea" v-model="dataForm.examineMsg" placeholder="审核意见" style="width: 80%;"></el-input>
+        </el-form-item>
+      </template>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        freelance: '',
+        workUnit: '',
+        partyName: '',
+        workAddr: '',
+        status: '',
+        deptId: '',
+        allDeptIds: [],
+        examineMsg: '',
+        party: '',
+        partyDate: ''
+      },
+      options: [],
+      freelanceOptions: [
+        {
+          value: 0,
+          label: '否'
+        }, {
+          value: 1,
+          label: '是'
+        }
+      ]
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getByLoginUser()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.allDeptIds = []
+          this.dataForm.deptId = ''
+          this.dataForm.workAddr = ''
+        }
+      })
+    },
+    getByLoginUser () {
+      this.$http
+        .get(`/sys/dept/party/getDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/flowparty/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (this.dataForm.freelance === 1) {
+          this.dataForm.workUnit = ''
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put'](!this.dataForm.id ? '/app-user/flowparty/save' : '/app-user/flowparty/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  },
+  computed: {
+    dataRule () {
+      return {
+        examineMsg: [
+          { required: this.dataForm.status === 1 ? true : false, message: this.$t('validate.required'), trigger: blur }
+        ]
+      }
+    }
+  }
+}
+</script>
+<style textarea="javascript">
+.el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/views/modules/user/flowparty-detail.vue b/src/views/modules/user/flowparty-detail.vue
new file mode 100755
index 00000000..4be53829
--- /dev/null
+++ b/src/views/modules/user/flowparty-detail.vue
@@ -0,0 +1,100 @@
+<template>
+  <el-dialog :visible.sync="visible" title="流动党员详情" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" ref="dataForm"  @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+      <el-form-item label="姓名" prop="name" v-if="dataForm.name">
+        <span>{{dataForm.name}}</span>
+      </el-form-item>
+      <el-form-item label="证件号码" prop="idCard" v-if="dataForm.idCard">
+        <span>{{dataForm.idCard}}</span>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile" v-if="dataForm.mobile">
+        <span>{{dataForm.mobile}}</span>
+      </el-form-item>
+      <el-form-item label="居民住址" prop="address" v-if="dataForm.address">
+        <span>{{dataForm.address}}</span>
+      </el-form-item>
+      <!-- <el-form-item label="自由职业者" prop="freelance">
+        <span v-if="dataForm.freelance === 0">否</span>
+        <span v-if="dataForm.freelance === 1">是</span>
+      </el-form-item> -->
+      <el-form-item label="党员属性" prop="party">
+        <span v-if="dataForm.party === 0">流入党员</span>
+        <span v-if="dataForm.party === 1">流出党员</span>
+      </el-form-item>
+      <el-form-item label="入党时间" prop="partyDate" v-if="dataForm.partyDate">
+        <span>{{dataForm.partyDate}}</span>
+      </el-form-item>
+      <el-form-item label="组织关系党支部" prop="partyName" v-if="dataForm.partyName">
+        <span>{{dataForm.partyName}}</span>
+      </el-form-item>
+      <el-form-item label="组织关系地址" prop="partyName" v-if="dataForm.partyName">
+        <span>{{dataForm.partyAddr}}</span>
+      </el-form-item>
+      <el-form-item label="现职工作单位" prop="workUnit" v-if="dataForm.workUnit">
+        <span>{{dataForm.workUnit}}</span>
+      </el-form-item>
+      <el-form-item label="现职单位地址" prop="workAddr" v-if="dataForm.workAddr">
+        <span>{{dataForm.workAddr}}</span>
+      </el-form-item>
+      <el-form-item label="所属社区" prop="allDeptIds" v-if="dataForm.allDeptIds">
+        <span>{{dataForm.parentDeptNames}}</span>
+      </el-form-item>
+      <!-- <template v-if="dataForm.status === 1">
+        <el-form-item label="审核意见" prop="examineMsg" v-if="dataForm.status === 1">
+          <span>{{ dataForm.examineMsg }}</span>
+        </el-form-item>
+      </template> -->
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false" type="primary">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        freelance: '',
+        workUnit: '',
+        partyName: '',
+        workAddr: '',
+        status: '',
+        deptId: '',
+        allDeptIds: [],
+        examineMsg: ''
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/flowparty/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/flowparty.vue b/src/views/modules/user/flowparty.vue
new file mode 100755
index 00000000..7aeeb220
--- /dev/null
+++ b/src/views/modules/user/flowparty.vue
@@ -0,0 +1,210 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__flowparty}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属社区">
+          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" filterable clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="姓名" label-width="70px">
+          <el-input v-model="dataForm.name" placeholder="请输入姓名" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="证件号码" label-width="70px">
+          <el-input v-model="dataForm.idCard" placeholder="请输入证件号码" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" label-width="70px">
+          <el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="党员属性" label-width="70px">
+          <el-select v-model="dataForm.party" placeholder="请选择" clearable>
+            <el-option v-for="item in partyOptions" :key="item.value" :label="item.label" :value="item.value"
+              :v-model="dataForm.party">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="审核状态" label-width="70px">
+          <el-select v-model="dataForm.status" placeholder="请选择">
+            <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"
+              :v-model="dataForm.status">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item> -->
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="name" label="姓名" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="idCard" label="身份证号码" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="mobile" label="电话" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="freelance" label="自由职业者" header-align="center" align="center" width="100"
+          :formatter="fomartFreelance"></el-table-column> -->
+        <el-table-column prop="party" label="党员属性" header-align="center" align="center" width="100"
+          :formatter="fomartParty"></el-table-column>
+        <el-table-column prop="partyDate" label="入党时间" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="partyName" label="组织关系党支部" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="partyName" label="组织关系地址" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="workUnit" label="现职单位名称" header-align="center" align="center"
+          width="150"></el-table-column>
+        <el-table-column prop="workAddr" label="现职单位地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="所属社区" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="status" label="审核状态" header-align="center" align="center" width="80"
+          :formatter="formatStatus"></el-table-column> -->
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <!-- <el-button type="text" size="small" @click="examine(scope.row)">{{ $t(scope.row.status === 0 ) ? '审核' : '驳回' }}</el-button> -->
+            <el-button type="text" size="mini" @click="detail(scope.row.id)" class="custom-table-button-default">查看</el-button>
+            <!-- <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> -->
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <flowParty-detail v-if="detailVisible" ref="flowPartyDetail" @refreshDataList="getDataList"></flowParty-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './flowparty-add-or-update'
+import FlowPartyDetail from './flowparty-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/flowparty/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/flowparty',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        freelance: '',
+        partyName: '',
+        workUnit: '',
+        workAddr: '',
+        status: '',
+        deptId: '',
+        allDeptIds: [],
+        party: '',
+        partyDate: ''
+      },
+      ids: [],
+      options: [],
+      detailVisible: false,
+      statusOptions: [
+        {
+          value: 0,
+          label: '未审核'
+        },
+        {
+          value: 1,
+          label: '已审核'
+        }
+      ],
+      partyOptions: [
+        {
+          value: 0,
+          label: '流入党员'
+        }, {
+          value: 1,
+          label: '流出党员'
+        }
+      ]
+    }
+  },
+  components: {
+    AddOrUpdate,
+    FlowPartyDetail
+  },
+  created: function () {
+    this.getOptions()
+  },
+  watch: {
+    'ids': function (val) {
+      this.dataForm.deptId = val.join(',')
+    }
+  },
+  methods: {
+    getOptions () {
+      this.$http.get(`/api/admin/dept/getAllDeptTree`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data
+      }).catch(() => { })
+    },
+    detail (userId) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.flowPartyDetail.dataForm.id = userId
+        this.$refs.flowPartyDetail.init()
+      })
+    },
+    formatStatus (row) {
+      if (row.status === 0) {
+        return '未审核'
+      } else {
+        return '已审核'
+      }
+    },
+    fomartFreelance (row) {
+      if (row.freelance === 0) {
+        return '否'
+      } else {
+        return '是'
+      }
+    },
+    fomartParty (row) {
+      if (row.party === undefined && row.party === '') {
+        return ''
+      } else if (row.party === 0) {
+        return '流入党员'
+      } else {
+        return '流出党员'
+      }
+    },
+    // 审核驳回
+    examine (row) {
+      row.status = row.status === 0 ? 1 : 0
+      const data = {
+        id: row.id,
+        status: row.status,
+        allDeptIds: row.allDeptIds
+      }
+      this.$http['put']('/app-user/flowparty/', data).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.visible = false
+            this.getDataList()
+          }
+        })
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/intoparty-add-or-update.vue b/src/views/modules/user/intoparty-add-or-update.vue
new file mode 100755
index 00000000..c231a150
--- /dev/null
+++ b/src/views/modules/user/intoparty-add-or-update.vue
@@ -0,0 +1,211 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="dataForm.name" placeholder="姓名" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="身份证号码" prop="idCard">
+        <el-input v-model="dataForm.idCard" placeholder="身份证号码" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="电话" prop="mobile">
+        <el-input v-model="dataForm.mobile" placeholder="电话" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="是否自由职业者" prop="freelance">
+        <el-select v-model="dataForm.freelance" disabled>
+          <el-option v-for="item in freelanceOptions" :key="item.value" :label="item.label" :value="item.value"
+            :v-model="dataForm.freelance">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工作单位名称" prop="workUnit">
+        <el-input v-model="dataForm.workUnit" placeholder="工作单位名称" disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="工作单位地址" prop="workAddr">
+        <el-input v-model="dataForm.workAddr" placeholder="工作单位地址" disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="所属社区" prop="parentDeptNames">
+        <el-input v-model="dataForm.parentDeptNames" placeholder="所属社区" disabled="true"></el-input>
+      </el-form-item>
+      <!-- <el-form-item label="审核状态" prop="status">
+        <el-select v-model="dataForm.status" disabled>
+          <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"
+            :v-model="dataForm.freelance">
+          </el-option>
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="居住网格" prop="allDeptNames">
+        <el-input v-model="dataForm.allDeptNames" placeholder="居住网格" disabled="true"></el-input>
+      </el-form-item> -->
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('close') }}</el-button>
+      <el-button type="primary" @click="examine()">{{ $t(dataForm.status === 0 ? '审核' : '驳回') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        freelance: '',
+        workUnit: '',
+        workAddr: '',
+        agencyId: '',
+        status: '',
+        deptId: '',
+        allDeptIds: [],
+        parentDeptNames: '',
+        allDeptNames: ''
+      },
+      options: [],
+      freelanceOptions: [
+        {
+          value: 0,
+          label: '否'
+        }, {
+          value: 1,
+          label: '是'
+        }
+      ],
+      statusOptions: [
+        {
+          value: 0,
+          label: '未审核'
+        }, {
+          value: 1,
+          label: '已审核'
+        }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        freelance: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        workUnit: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        workAddr: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        agencyId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getByLoginUser()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    getByLoginUser () {
+      this.$http
+        .get(`/sys/dept/party/getDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/intoparty/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/intoparty/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    // 审核驳回
+    examine () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+      })
+      const falg = this.dataForm.status === 0 ? 1 : 0
+      const data = {
+        id: this.dataForm.id,
+        status: falg
+      }
+      this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/intoparty/', data).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.visible = false
+            this.$emit('refreshDataList')
+          }
+        })
+      }).catch(() => { })
+    }
+  }
+}
+</script>
+<style textarea="javascript">
+.el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/views/modules/user/intoparty.vue b/src/views/modules/user/intoparty.vue
new file mode 100755
index 00000000..8fa840f9
--- /dev/null
+++ b/src/views/modules/user/intoparty.vue
@@ -0,0 +1,109 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__intoparty}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="姓名" label-width="70px">
+          <el-input v-model="dataForm.name" placeholder="请输入姓名" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="证件号码" label-width="70px">
+          <el-input v-model="dataForm.idCard" placeholder="请输入证件号码" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" label-width="70px">
+          <el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="审核状态" label-width="70px">
+          <el-select v-model="dataForm.status" placeholder="请选择" clearable>
+            <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"
+              :v-model="dataForm.status">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item> -->
+        <!-- <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item> -->
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="name" label="姓名" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="idCard" label="身份证号码" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="mobile" label="电话" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="freelance" label="自由职业者" header-align="center" align="center" width="100"
+          :formatter="fomartFreelance"></el-table-column>
+        <el-table-column prop="workUnit" label="工作单位名称" header-align="center" align="center"
+          width="150"></el-table-column>
+        <el-table-column prop="workAddr" label="工作单位地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="所属社区" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="status" label="审核状态" header-align="center" align="center" width="80"
+          :formatter="formatStatus"></el-table-column> -->
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)" class="custom-table-button-default">查看</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './intoparty-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/intoparty/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/intoparty',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      statusOptions: [
+        {
+          value: 0,
+          label: '未审核'
+        }, {
+          value: 1,
+          label: '已审核'
+        }
+      ]
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    formatStatus (row) {
+      if (row.status === 0) {
+        return '未审核'
+      } else {
+        return '已审核'
+      }
+    },
+    fomartFreelance (row) {
+      if (row.freelance === 0) {
+        return '否'
+      } else {
+        return '是'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/knightpionner-add-or-update.vue b/src/views/modules/user/knightpionner-add-or-update.vue
new file mode 100755
index 00000000..e4a35b62
--- /dev/null
+++ b/src/views/modules/user/knightpionner-add-or-update.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="身份证号" prop="idCard">
+        <el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile">
+        <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+      </el-form-item>
+      <template v-if="dataForm.id == ''">
+        <el-form-item label="服务网格所属社区" prop="deptId">
+          <el-cascader v-model="dataForm.deptId" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.id != ''">
+        <el-form-item label="服务网格所属社区" prop="allDeptIds">
+          <el-cascader v-model="dataForm.allDeptIds" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <el-form-item label="现工作单位" prop="workUnit">
+        <el-input v-model="dataForm.workUnit" placeholder="现工作单位"></el-input>
+      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="是否中共党员" prop="party">
+            <el-select v-model="dataForm.party">
+              <el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
+                :v-model="dataForm.party">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="行业类别" prop="courier">
+            <el-select v-model="dataForm.courier">
+              <el-option v-for="item in courierOptions" :key="item.value" :label="item.label" :value="item.value"
+                :v-model="dataForm.courier">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="dataForm.status">
+          <el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
+            :v-model="dataForm.status">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <template v-if="dataForm.status === 1">
+        <el-form-item label="审核意见" prop="examineMsg">
+          <el-input type="textarea" v-model="dataForm.examineMsg" placeholder="审核意见" style="width: 80%;"></el-input>
+        </el-form-item>
+      </template>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        workUnit: '',
+        party: '',
+        courier: '',
+        deptId: '',
+        allDeptIds: [],
+        status: '',
+        examineMsg: ''
+      },
+      options: [],
+      regOptions: [
+        {
+          value: 0,
+          label: '否'
+        }, {
+          value: 1,
+          label: '是'
+        }
+      ],
+      courierOptions: [
+        {
+          value: 0,
+          label: '直播电商'
+        },
+        {
+          value: 1,
+          label: '网约车司机'
+        },
+        {
+          value: 2,
+          label: '外卖配送人员'
+        },
+        {
+          value: 3,
+          label: '快递小哥'
+        },
+        {
+          value: 4,
+          label: '道路运输行业'
+        },
+        {
+          value: 5,
+          label: '其他'
+        }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        party: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        courier: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        examineMsg: [
+          { required: this.dataForm.status === 1 ? true : false, message: this.$t('validate.required'), trigger: blur }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getByLoginUser()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    getByLoginUser () {
+      this.$http
+        .get(`/sys/dept/party/getDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/knightpionner/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put'](!this.dataForm.id ? '/app-user/knightpionner/save' : '/app-user/knightpionner/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style textarea="javascript">
+.el-input {
+  width: 81% !important;
+}
+
+.el-col-12 {
+  width: 45% !important;
+}
+
+.el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/views/modules/user/knightpionner-detail.vue b/src/views/modules/user/knightpionner-detail.vue
new file mode 100755
index 00000000..560dc540
--- /dev/null
+++ b/src/views/modules/user/knightpionner-detail.vue
@@ -0,0 +1,119 @@
+<template>
+  <el-dialog :visible.sync="visible" title="骑士先锋详情" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" ref="dataForm"  @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+      <el-form-item label="姓名" prop="name" v-if="dataForm.name">
+        <span>{{dataForm.name}}</span>
+      </el-form-item>
+      <el-form-item label="证件号码" prop="idCard" v-if="dataForm.idCard">
+        <span>{{dataForm.idCard}}</span>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile" v-if="dataForm.mobile">
+        <span>{{dataForm.mobile}}</span>
+      </el-form-item>
+      <el-form-item label="居民住址" prop="address" v-if="dataForm.address">
+        <span>{{dataForm.address}}</span>
+      </el-form-item>
+      <!-- <el-form-item label="自由职业者" prop="freelance">
+        <span v-if="dataForm.freelance === 0">否</span>
+        <span v-if="dataForm.freelance === 1">是</span>
+      </el-form-item> -->
+      <el-form-item label="是否中共党员" prop="party">
+        <span v-if="dataForm.party === 0">否</span>
+        <span v-if="dataForm.party === 1">是</span>
+      </el-form-item>
+      <el-form-item label="现属党支部" prop="partyName" v-if="dataForm.partyName">
+        <span>{{dataForm.partyName}}</span>
+      </el-form-item>
+      <template v-if="dataForm.freelance == 0">
+        <el-form-item label="现工作单位" prop="workUnit" v-if="dataForm.workUnit">
+          <span>{{dataForm.workUnit}}</span>
+        </el-form-item>
+        <el-form-item label="单位地址" prop="workAddr" v-if="dataForm.workAddr">
+          <span>{{dataForm.workAddr}}</span>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.freelance == 1">
+        <el-form-item label="现工作单位" prop="workUnit" v-if="dataForm.workUnit">
+          <span>{{dataForm.workUnit}}</span>
+        </el-form-item>
+      </template>
+      <el-form-item label="服务网格所属社区" prop="allDeptIds" v-if="dataForm.allDeptIds">
+        <span>{{dataForm.parentDeptNames}}</span>
+      </el-form-item>
+      <el-form-item label="行业类别" prop="courier" v-if="dataForm.courier">
+        <span>{{ formartCourier(dataForm.courier) }}</span>
+      </el-form-item>
+      <template v-if="dataForm.status === 1">
+        <el-form-item label="审核意见" prop="examineMsg" v-if="dataForm.status === 1">
+          <span>{{ dataForm.examineMsg }}</span>
+        </el-form-item>
+      </template>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false" type="primary">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        freelance: '',
+        workUnit: '',
+        partyName: '',
+        workAddr: '',
+        status: '',
+        deptId: '',
+        allDeptIds: [],
+        examineMsg: ''
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/knightpionner/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    formartCourier (value) {
+      if (value === 0) {
+        return '直播电商'
+      } else if (value === 1) {
+        return '网约车司机'
+      } else if (value === 2) {
+        return '外卖配送员'
+      } else if (value === 3) {
+        return '快递小哥'
+      } else if (value === 4) {
+        return '道路运输行业'
+      } else if (value === 5) {
+        return '其他'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/knightpionner.vue b/src/views/modules/user/knightpionner.vue
new file mode 100755
index 00000000..34625635
--- /dev/null
+++ b/src/views/modules/user/knightpionner.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__knightpionner}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="姓名" label-width="70px">
+          <el-input v-model="dataForm.name" placeholder="请输入姓名" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="证件号码" label-width="70px">
+          <el-input v-model="dataForm.idCard" placeholder="请输入证件号码" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" label-width="70px">
+          <el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item> -->
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="name" label="姓名" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="mobile" label="手机号码" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="party" label="是否中共党员" header-align="center" align="center" width="80"
+          :formatter="fomartValue"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="服务网格所属社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="courier" label="行业类别" header-align="center" align="center" width="180"
+          :formatter="formartCourier"></el-table-column>
+        <el-table-column prop="workUnit" label="现工作单位" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="detail(scope.row.id)" class="custom-table-button-default">查看</el-button>
+            <!-- <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> -->
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <knightpionner-detail v-if="detailVisible" ref="knightpionnerDetail" @refreshDataList="getDataList"></knightpionner-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './knightpionner-add-or-update'
+import KnightpionnerDetail from './knightpionner-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/knightpionner/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/knightpionner',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      detailVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate,
+    KnightpionnerDetail
+  },
+  methods: {
+    detail (userId) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.knightpionnerDetail.dataForm.id = userId
+        this.$refs.knightpionnerDetail.init()
+      })
+    },
+    fomartValue (value) {
+      if (value === 0) {
+        return '否'
+      } else {
+        return '是'
+      }
+    },
+    formartCourier (value) {
+      if (value.courier === 0) {
+        return '直播电商'
+      } else if (value.courier === 1) {
+        return '网约车司机'
+      } else if (value.courier === 2) {
+        return '外卖配送员'
+      } else if (value.courier === 3) {
+        return '快递小哥'
+      } else if (value.courier === 4) {
+        return '道路运输行业'
+      } else if (value.courier === 5) {
+        return '其他'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/redspearhead-add-or-update.vue b/src/views/modules/user/redspearhead-add-or-update.vue
new file mode 100755
index 00000000..97b5e1c8
--- /dev/null
+++ b/src/views/modules/user/redspearhead-add-or-update.vue
@@ -0,0 +1,198 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+      <el-form-item label="姓名" prop="name">
+          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="证件号码" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号码"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+      </el-form-item>
+      <template v-if="dataForm.id == ''">
+        <el-form-item label="所属社区" prop="deptId">
+          <el-cascader v-model="dataForm.deptId" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.id != ''">
+        <el-form-item label="所属社区" prop="allDeptIds">
+          <el-cascader v-model="dataForm.allDeptIds" :options="options" clearable></el-cascader>
+        </el-form-item>
+      </template>
+      <el-form-item label="服务类型" prop="serviceType">
+          <el-select v-model="dataForm.serviceType">
+              <el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
+                :v-model="dataForm.serviceType">
+              </el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="现工作单位" prop="workUnit">
+          <el-input v-model="dataForm.workUnit" placeholder="现工作单位"></el-input>
+      </el-form-item>
+      <el-form-item label="特长" prop="specialty">
+        <el-input type="textarea" v-model="dataForm.specialty" placeholder="特长" style="width: 80%;"></el-input>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="dataForm.status">
+          <el-option v-for="item in freelanceOptions" :key="item.value" :label="item.label" :value="item.value"
+            :v-model="dataForm.status">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <template v-if="dataForm.status === 1">
+        <el-form-item label="审核意见" prop="examineMsg">
+          <el-input type="textarea" v-model="dataForm.examineMsg" placeholder="审核意见" style="width: 80%;"></el-input>
+        </el-form-item>
+      </template>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        deptId: '',
+        workUnit: '',
+        serviceType: '',
+        specialty: '',
+        allDeptIds: [],
+        status: '',
+        examineMsg: ''
+      },
+      options: [],
+      regOptions: [
+        {
+          value: '0',
+          label: '街道服务队'
+        }, {
+          value: '1',
+          label: '社区服务队'
+        }
+      ],
+      freelanceOptions: [
+        {
+          value: 0,
+          label: '否'
+        }, {
+          value: 1,
+          label: '是'
+        }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        serviceType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        examineMsg: [
+          { required: this.dataForm.status === 1 ? true : false, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getByLoginUser()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.allDeptIds = []
+          this.dataForm.deptId = ''
+          this.dataForm.workAddr = ''
+        }
+      })
+    },
+    getByLoginUser () {
+      this.$http
+        .get(`/sys/dept/party/getDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/redspearhead/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put'](!this.dataForm.id ? '/app-user/redspearhead/save' : '/app-user/redspearhead/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style textarea="javascript">
+.el-input {
+  width: 81% !important;
+}
+
+.el-col-12 {
+  width: 45% !important;
+}
+
+.el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/views/modules/user/redspearhead-detail.vue b/src/views/modules/user/redspearhead-detail.vue
new file mode 100755
index 00000000..cabbc4c0
--- /dev/null
+++ b/src/views/modules/user/redspearhead-detail.vue
@@ -0,0 +1,97 @@
+<template>
+  <el-dialog :visible.sync="visible" title="红色尖兵详情" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+      <el-form-item label="姓名" prop="name" v-if="dataForm.name">
+        <span>{{ dataForm.name }}</span>
+      </el-form-item>
+      <el-form-item label="证件号码" prop="idCard" v-if="dataForm.idCard">
+        <span>{{ dataForm.idCard }}</span>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile" v-if="dataForm.mobile">
+        <span>{{ dataForm.mobile }}</span>
+      </el-form-item>
+      <el-form-item label="居民住址" prop="address" v-if="dataForm.address">
+        <span>{{ dataForm.address }}</span>
+      </el-form-item>
+      <el-form-item label="自由职业者" prop="freelance">
+        <span v-if="dataForm.freelance === 0">否</span>
+        <span v-if="dataForm.freelance === 1">是</span>
+      </el-form-item>
+      <el-form-item label="现属党支部" prop="partyName" v-if="dataForm.partyName">
+        <span>{{ dataForm.partyName }}</span>
+      </el-form-item>
+      <template v-if="dataForm.freelance == 0">
+        <el-form-item label="现工作单位" prop="workUnit" v-if="dataForm.workUnit">
+          <span>{{ dataForm.workUnit }}</span>
+        </el-form-item>
+        <el-form-item label="单位地址" prop="workAddr" v-if="dataForm.workAddr">
+          <span>{{ dataForm.workAddr }}</span>
+        </el-form-item>
+      </template>
+      <template v-if="dataForm.freelance == 1">
+        <el-form-item label="现工作单位" prop="workUnit" v-if="dataForm.workUnit">
+          <span>{{ dataForm.workUnit }}</span>
+        </el-form-item>
+      </template>
+      <el-form-item label="所属社区" prop="allDeptIds" v-if="dataForm.allDeptIds">
+        <span>{{ dataForm.parentDeptNames }}</span>
+      </el-form-item>
+      <template v-if="dataForm.status === 1">
+        <el-form-item label="审核意见" prop="examineMsg" v-if="dataForm.status === 1">
+          <span>{{ dataForm.examineMsg }}</span>
+        </el-form-item>
+      </template>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false" type="primary">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+  
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        freelance: '',
+        workUnit: '',
+        partyName: '',
+        workAddr: '',
+        status: '',
+        deptId: '',
+        allDeptIds: [],
+        examineMsg: ''
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/redspearhead/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/modules/user/redspearhead.vue b/src/views/modules/user/redspearhead.vue
new file mode 100755
index 00000000..475603bc
--- /dev/null
+++ b/src/views/modules/user/redspearhead.vue
@@ -0,0 +1,107 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__redspearhead}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="姓名" label-width="70px">
+          <el-input v-model="dataForm.name" placeholder="请输入姓名" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="证件号码" label-width="70px">
+          <el-input v-model="dataForm.idCard" placeholder="请输入证件号码" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" label-width="70px">
+          <el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item> -->
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="name" label="姓名" header-align="center" align="center" width="90"></el-table-column>
+        <el-table-column prop="idCard" label="证件号码" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="所属社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="workUnit" label="现工作单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="serviceType" label="服务类型" header-align="center" align="center"
+          :formatter="formatValue"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="detail(scope.row.id)" class="custom-table-button-default">查看</el-button>
+            <!-- <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> -->
+            <!-- <el-button  type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <redspearhead-detail v-if="detailVisible" ref="redspearheadDetail" @refreshDataList="getDataList"></redspearhead-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './redspearhead-add-or-update'
+import RedspearheadDetail from './redspearhead-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      detailVisible: false,
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/redspearhead/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/redspearhead',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      regOptions: [
+        {
+          value: '0',
+          label: '街道服务队'
+        }, {
+          value: '1',
+          label: '社区服务队'
+        }
+      ]
+    }
+  },
+  components: {
+    AddOrUpdate,
+    RedspearheadDetail
+  },
+  methods: {
+    formatValue (value) {
+      if (value.serviceType === '0') {
+        return '街道服务队'
+      } else {
+        return '社区服务队'
+      }
+    },
+    detail (userId) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.redspearheadDetail.dataForm.id = userId
+        this.$refs.redspearheadDetail.init()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/reportparty-add-or-update.vue b/src/views/modules/user/reportparty-add-or-update.vue
new file mode 100755
index 00000000..fa80c2c4
--- /dev/null
+++ b/src/views/modules/user/reportparty-add-or-update.vue
@@ -0,0 +1,274 @@
+<!-- eslint-disable no-unneeded-ternary -->
+<template>
+    <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+        :close-on-press-escape="false">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+            :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+            <el-form-item label="姓名" prop="name">
+                <el-input v-model="dataForm.name" placeholder="党员姓名"></el-input>
+            </el-form-item>
+            <el-form-item label="身份证号码(后6位)" prop="idCard">
+                <el-input v-model="dataForm.idCard" placeholder="证件号码"></el-input>
+            </el-form-item>
+            <el-form-item label="联系电话" prop="mobile">
+                <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+            </el-form-item>
+            <el-form-item label="工作单位" prop="workUnit">
+                <el-input v-model="dataForm.workUnit" placeholder="现工作单位"></el-input>
+            </el-form-item>
+            <el-form-item label="单位性质" prop="workType">
+                <el-input v-model="dataForm.workType" placeholder="工作单位性质"></el-input>
+            </el-form-item>
+            <el-form-item label="单位行业" prop="workIndustry">
+                <el-input v-model="dataForm.workIndustry" placeholder="工作单位行业"></el-input>
+            </el-form-item>
+            <el-form-item label="是否居住在市北" prop="shiBei">
+                <el-select v-model="dataForm.shiBei">
+                    <el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
+                        :v-model="dataForm.shiBei">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <template v-if="dataForm.shiBei === 0">
+                <el-form-item label="包联社区名称" prop="allDeptIds">
+                    <el-cascader v-model="dataForm.couplingCommunity" :options="options" clearable></el-cascader>
+                </el-form-item>
+            </template>
+            <template v-if="dataForm.shiBei === 1">
+                <el-form-item label="居住小区名称" prop="homeName">
+                    <el-input v-model="dataForm.homeName" placeholder="居住小区名称"></el-input>
+                </el-form-item>
+                <template v-if="dataForm.id == ''">
+                    <el-form-item label="所属社区" prop="deptId">
+                        <el-cascader v-model="dataForm.deptId" :options="options" clearable></el-cascader>
+                    </el-form-item>
+                </template>
+                <template v-if="dataForm.id != ''">
+                    <el-form-item label="所属社区" prop="allDeptIds">
+                        <el-cascader v-model="dataForm.allDeptIds" :options="options" clearable></el-cascader>
+                    </el-form-item>
+                </template>
+            </template>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="是否党员" prop="party">
+                        <el-select v-model="dataForm.party">
+                            <el-option v-for="item in regOptions" :key="item.value" :label="item.label"
+                                :value="item.value" :v-model="dataForm.party">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="是否愿意加入志愿者" prop="volunteer">
+                        <el-select v-model="dataForm.volunteer">
+                            <el-option v-for="item in regOptions" :key="item.value" :label="item.label"
+                                :value="item.value" :v-model="dataForm.volunteer">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="是否愿意加入网格员" prop="gridStaff">
+                        <el-select v-model="dataForm.gridStaff">
+                            <el-option v-for="item in regOptions" :key="item.value" :label="item.label"
+                                :value="item.value" :v-model="dataForm.gridStaff">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <template v-if="dataForm.shiBei === 1">
+                    <el-col :span="12">
+                        <el-form-item label="是否愿意加入业务委员会" prop="owners">
+                            <el-select v-model="dataForm.owners">
+                                <el-option v-for="item in regOptions" :key="item.value" :label="item.label"
+                                    :value="item.value" :v-model="dataForm.owners">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </template>
+            </el-row>
+            <el-form-item label="特长" prop="specialty">
+                <el-input type="textarea" v-model="dataForm.specialty" placeholder="特长" style="width: 80%;"></el-input>
+            </el-form-item>
+            <el-form-item label="审核状态" prop="status">
+                <el-select v-model="dataForm.status">
+                    <el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
+                        :v-model="dataForm.status">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <template v-if="dataForm.status === 1">
+                <el-form-item label="审核意见" prop="examineMsg">
+                    <el-input type="textarea" v-model="dataForm.examineMsg" placeholder="审核意见"
+                        style="width: 80%;"></el-input>
+                </el-form-item>
+            </template>
+        </el-form>
+        <template slot="footer">
+            <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+            <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        deptId: '',
+        homeName: '',
+        workUnit: '',
+        workType: '',
+        workIndustry: '',
+        specialty: '',
+        party: '',
+        volunteer: '',
+        gridStaff: '',
+        owners: '',
+        shiBei: '',
+        allDeptIds: [],
+        couplingCommunity:[],
+        status: '',
+        examineMsg: ''
+      },
+      options: [],
+      regOptions: [
+        {
+          value: 0,
+          label: '否'
+        }, {
+          value: 1,
+          label: '是'
+        }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        homeName: [
+          { required: this.dataForm.shiBei === 1 ? true : false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        party: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        volunteer: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridStaff: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        owners: [
+          { required: this.dataForm.shiBei === 1 ? true : false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: this.dataForm.shiBei === 1 ? true : false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        examineMsg: [
+          { required: this.dataForm.status === 1 ? true : false, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.getByLoginUser()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.allDeptIds = []
+          this.dataForm.deptId = ''
+          this.dataForm.workAddr = ''
+        }
+      })
+    },
+    getByLoginUser () {
+      this.$http
+        .get(`/sys/dept/party/getDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/reportparty/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (this.dataForm.shiBei === 0) {
+          this.dataForm.homeName = ''
+        }
+          this.$http['post'](!this.dataForm.id ? '/app-user/reportparty/save' : '/app-user/reportparty/update', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style textarea="javascript">
+.el-input {
+  width: 81% !important;
+}
+
+.el-col-12 {
+  width: 45% !important;
+}
+
+.el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/views/modules/user/reportparty-detail.vue b/src/views/modules/user/reportparty-detail.vue
new file mode 100755
index 00000000..017ae3ab
--- /dev/null
+++ b/src/views/modules/user/reportparty-detail.vue
@@ -0,0 +1,133 @@
+<template>
+    <el-dialog :visible.sync="visible" title="在职党员详情" :close-on-click-modal="false" :close-on-press-escape="false">
+        <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+            :label-width="$i18n.locale === 'en-US' ? '120px' : '180px'">
+            <el-form-item label="姓名" prop="name" v-if="dataForm.name">
+                <span>{{ dataForm.name }}</span>
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard" v-if="dataForm.idCard">
+                <span>{{ dataForm.idCard }}</span>
+            </el-form-item>
+            <el-form-item label="手机号码" prop="mobile" v-if="dataForm.mobile">
+                <span>{{ dataForm.mobile }}</span>
+            </el-form-item>
+            <el-form-item label="工作单位" prop="workUnit">
+                <span>{{ dataForm.workUnit }}</span>
+            </el-form-item>
+            <el-form-item label="单位性质" prop="workType">
+                <span>{{ dataForm.workType }}</span>
+            </el-form-item>
+            <el-form-item label="专业特长" prop="workIndustry">
+                <span>{{ dataForm.workIndustry }}</span>
+            </el-form-item>
+            <el-form-item label="服务意向" prop="specialty">
+                <span>{{ dataForm.hobbies }}</span>
+            </el-form-item>
+            <el-form-item label="报到时间" prop="workIndustry">
+                <span>{{ dataForm.updatedTime }}</span>
+            </el-form-item>
+            <el-form-item label="是否居住在市北" prop="shiBei">
+                <span v-if="dataForm.shiBei === 0">否</span>
+                <span v-if="dataForm.shiBei === 1">是</span>
+            </el-form-item>
+            <template v-if="dataForm.shiBei === 0">
+                <el-form-item label="居住地址" prop="villageName">
+                    <span>{{ dataForm.villageName }}</span>
+                </el-form-item>
+            </template>
+            <template v-if="dataForm.shiBei === 1">
+                <el-form-item label="所属社区" prop="allDeptIds">
+                    <span>{{ dataForm.parentDeptNames }}</span>
+                </el-form-item>
+                <el-form-item label="居住小区名称" prop="homeName">
+                    <span>{{ dataForm.homeName }}</span>
+                </el-form-item>
+            </template>
+            <template v-if="dataForm.shiBei === 0">
+                <el-form-item label="包联社区名称" prop="couplingCommunityName">
+                    <span>{{ dataForm.couplingCommunityName }}</span>
+                </el-form-item>
+            </template>
+            <el-form-item label="是否党员" prop="party">
+                <span v-if="dataForm.party === 0">否</span>
+                <span v-if="dataForm.party === 1">是</span>
+            </el-form-item>
+            <el-form-item label="是否愿意加入志愿者" prop="volunteer">
+                <span v-if="dataForm.volunteer === 0">否</span>
+                <span v-if="dataForm.volunteer === 1">是</span>
+            </el-form-item>
+            <el-form-item label="是否愿意加入网格员" prop="gridStaff">
+                <span v-if="dataForm.gridStaff === 0">否</span>
+                <span v-if="dataForm.gridStaff === 1">是</span>
+            </el-form-item>
+            <el-form-item label="是否愿意加入网格员" prop="gridStaff">
+                <span v-if="dataForm.gridStaff === 0">否</span>
+                <span v-if="dataForm.gridStaff === 1">是</span>
+            </el-form-item>
+            <template v-if="dataForm.shiBei === 1">
+                <el-form-item label="是否愿意加入业务委员会" prop="owners">
+                    <span v-if="dataForm.owners === 0">否</span>
+                    <span v-if="dataForm.owners === 1">是</span>
+                </el-form-item>
+            </template>
+            <!-- <template v-if="dataForm.status === 1">
+        <el-form-item label="审核意见" prop="examineMsg" v-if="dataForm.status === 1">
+          <span>{{ dataForm.examineMsg }}</span>
+        </el-form-item>
+      </template> -->
+        </el-form>
+        <template slot="footer">
+            <el-button @click="visible = false" type="primary">{{ $t('confirm') }}</el-button>
+        </template>
+    </el-dialog>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            visible: false,
+            dataForm: {
+                id: '',
+                name: '',
+                idCard: '',
+                mobile: '',
+                freelance: '',
+                workUnit: '',
+                partyName: '',
+                workAddr: '',
+                status: '',
+                deptId: '',
+                hobbies: '',
+                villageName: '',
+                updatedTime: '',
+                couplingCommunityName:'',
+                allDeptIds: [],
+                couplingCommunity:[]
+            }
+        }
+    },
+    methods: {
+        init() {
+            this.visible = true
+            this.$nextTick(() => {
+                this.$refs['dataForm'].resetFields()
+                if (this.dataForm.id) {
+                    this.getInfo()
+                }
+            })
+        },
+        // 获取信息
+        getInfo() {
+            this.$http.get(`/app-user/reportparty/${this.dataForm.id}`).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                this.dataForm = {
+                    ...this.dataForm,
+                    ...res.data
+                }
+            }).catch(() => { })
+        }
+    }
+}
+</script>
diff --git a/src/views/modules/user/reportparty.vue b/src/views/modules/user/reportparty.vue
new file mode 100755
index 00000000..05636a1f
--- /dev/null
+++ b/src/views/modules/user/reportparty.vue
@@ -0,0 +1,247 @@
+<template>
+    <el-card shadow="never" class="aui-card--fill">
+        <div class="mod-__reportparty}">
+            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+                <el-form-item label="报道类型">
+                    <el-select v-model="dataForm.sel">
+                        <el-option v-for="item in selectOptions" :key="item.value" :label="item.label"
+                            :value="item.value" :v-model="dataForm.sel">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属社区">
+                    <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" filterable clearable>
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="姓名" label-width="70px">
+                    <el-input v-model="dataForm.name" placeholder="请输入姓名" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="证件号码" label-width="70px">
+                    <el-input v-model="dataForm.idCard" placeholder="请输入证件号码" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" label-width="70px">
+                    <el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="工作单位" label-width="70px">
+                    <el-input v-model="dataForm.workUnit" placeholder="请输入工作单位" clearable></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="success" @click="exportHandle()" class="custom-button-modify">{{ $t('export')
+                        }}</el-button>
+                </el-form-item>
+                <!-- <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item> -->
+            </el-form>
+            <el-table v-loading="dataListLoading" :data="dataList" border
+                @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+                <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+                <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
+                <!-- <el-table-column prop="idCard" label="证件号码" header-align="center" align="center"></el-table-column> -->
+                <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="parentDeptNames" label="行政区域/社区" header-align="center"
+                    align="center"></el-table-column>
+                <el-table-column prop="homeName" label="小区名称" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="workUnit" label="工作单位" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="couplingCommunityName" label="包联社区" header-align="center"
+                    align="center"></el-table-column>
+                <el-table-column prop="updatedTime" label="报到时间" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="party" label="是否党员" header-align="center" align="center"
+                    :formatter="formatParty"></el-table-column>
+                <el-table-column prop="volunteer" label="是否愿意加入志愿者" header-align="center" align="center"
+                    :formatter="formatVolunteer"></el-table-column>
+                <el-table-column prop="gridStaff" label="是否愿意加入网格员" header-align="center" align="center"
+                    :formatter="formatGridStaff"></el-table-column>
+                <el-table-column prop="owners" label="是否愿意加入业务委员会" header-align="center" align="center"
+                    :formatter="formatOwners"></el-table-column>
+                <!-- <el-table-column prop="status" label="审核状态" header-align="center" align="center" width="80"
+                    :formatter="formatStatus"></el-table-column> -->
+                <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+                    <template slot-scope="scope">
+                        <!-- <el-button type="text" size="small" @click="examine(scope.row)">{{ $t(scope.row.status === 0) ?
+                            '审核'
+                            : '驳回' }}</el-button> -->
+                        <el-button type="text" size="mini" @click="detail(scope.row.id)"
+                            class="custom-table-button-default">查看</el-button>
+                        <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update')
+                            }}</el-button>
+                        <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete')
+                            }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+                layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
+                @current-change="pageCurrentChangeHandle">
+            </el-pagination>
+            <!-- 弹窗, 新增 / 修改 审核-->
+            <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+            <reportParty-detail v-if="detailVisible" ref="reportPartyDetail"
+                @refreshDataList="getDataList"></reportParty-detail>
+            <!-- <reportparty-examine ref="reportPartyExamine" @refreshDataList="getDataList"></reportparty-examine> -->
+        </div>
+    </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './reportparty-add-or-update'
+import Flowparty from './flowparty'
+import ReportPartyDetail from './reportparty-detail'
+export default {
+    mixins: [mixinViewModule],
+    data() {
+        return {
+            mixinViewModuleOptions: {
+                getDataListURL: '/app-user/reportparty/page',
+                getDataListIsPage: true,
+                deleteURL: '/app-user/reportparty',
+                deleteIsBatch: true,
+                exportURL: '/app-user/reportparty/export'
+            },
+            dataForm: {
+                id: '',
+                name: '',
+                idCard: '',
+                mobile: '',
+                freelance: '',
+                workUnit: '',
+                partyName: '',
+                workAddr: '',
+                status: '',
+                deptId: '',
+                allDeptIds: [],
+                sel: 0,
+            },
+            detailVisible: false,
+            regOptions: [
+                {
+                    value: 0,
+                    label: '否'
+                }, {
+                    value: 1,
+                    label: '是'
+                }
+            ],
+            selectOptions: [
+                {
+                    value: 0,
+                    label: '居住社区'
+                }, {
+                    value: 1,
+                    label: '包联社区'
+                }
+            ],
+            ids: [],
+            options: [],
+            tempName: ''
+        }
+    },
+    components: {
+        AddOrUpdate,
+        Flowparty,
+        ReportPartyDetail
+    },
+    created: function () {
+        this.getOptions()
+    },
+    watch: {
+        'ids': function (val) {
+            this.dataForm.deptId = val.join(',')
+        }
+    },
+    methods: {
+        getOptions() {
+            this.$http
+                .get(`/sys/user/deptOptions/getByLoginUser`)
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    }
+                    this.options = res.data.options;
+                })
+                .catch(() => { });
+            this.$http
+                .post(`/sys/dept/queryUserSysDeptTypeKey`, {})
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    }
+                    this.optionsDept = res.data;
+                })
+                .catch(() => { });
+        },
+        formatParty(row) {
+            if (row.party === 0) {
+                return '否'
+            }  else {
+                return '是'
+            }
+        },
+        formatVolunteer(row) {
+            if (row.volunteer === 0) {
+                return '否'
+            } else {
+                return '是'
+            }
+        },
+        formatOwners(row) {
+            if (row.owners === 0) {
+                return '否'
+            } else {
+                return '是'
+            }
+        },
+        formatGridStaff(row) {
+            if (row.gridStaff === 0) {
+                return '否'
+            } else {
+                return '是'
+            }
+        },
+        // 审核驳回
+        examine(row) {
+            row.status = row.status === 0 ? 1 : 0
+            const data = {
+                id: row.id,
+                status: row.status,
+                allDeptIds: row.allDeptIds
+            }
+            this.$http['post']('/app-user/reportparty/update', data).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                this.$message({
+                    message: this.$t('prompt.success'),
+                    type: 'success',
+                    duration: 500,
+                    onClose: () => {
+                        this.visible = false
+                        this.getDataList()
+                    }
+                })
+            }).catch(() => { })
+        },
+        detail(userId) {
+            this.detailVisible = true
+            this.$nextTick(() => {
+                this.$refs.reportPartyDetail.dataForm.id = userId
+                this.$refs.reportPartyDetail.init()
+            })
+        },
+        formatStatus(row) {
+            if (row.status === 0) {
+                return '未审核'
+            } else {
+                return '已审核'
+            }
+        }
+    }
+}
+</script>