diff --git a/src/views/modules/heart/volunteer-add-or-update.vue b/src/views/modules/heart/volunteer-add-or-update.vue
index 3f98251..298c780 100644
--- a/src/views/modules/heart/volunteer-add-or-update.vue
+++ b/src/views/modules/heart/volunteer-add-or-update.vue
@@ -1,73 +1,76 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+  <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="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="describe">
-          <el-input v-model="dataForm.describe" placeholder="自我介绍"></el-input>
-      </el-form-item>
-          <el-form-item label="认证状态：0审核中 1审核通过 2审核驳回" prop="state">
-          <el-input v-model="dataForm.state" placeholder="认证状态：0审核中 1审核通过 2审核驳回"></el-input>
-      </el-form-item>
-          <el-form-item label="审核理由" prop="reason">
-          <el-input v-model="dataForm.reason" placeholder="审核理由"></el-input>
-      </el-form-item>
-          <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
-      </el-form-item>
-          <el-form-item label="头像地址" prop="url">
-          <el-input v-model="dataForm.url" placeholder="头像地址"></el-input>
-      </el-form-item>
-          <el-form-item label="党员标识：0否1是" prop="partyFlag">
-          <el-input v-model="dataForm.partyFlag" placeholder="党员标识：0否1是"></el-input>
-      </el-form-item>
-          <el-form-item label="部门ID" prop="deptId">
-          <el-input v-model="dataForm.deptId" placeholder="部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="部门名称" prop="deptName">
-          <el-input v-model="dataForm.deptName" placeholder="部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门ID" prop="allDeptIds">
-          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门名称" prop="allDeptNames">
-          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门" prop="parentDeptIds">
-          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门" prop="parentDeptNames">
-          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0-否，1-是" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0-否，1-是"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
+          <el-form-item label="姓名：" prop="realName" label-width="100px">
+              {{dataForm.realName}}
+      </el-form-item>
+        <el-form-item label="电话：" prop="mobile" label-width="100px">
+            {{dataForm.mobile}}
+        </el-form-item>
+          <el-form-item label="身份证：" prop="idCard" label-width="100px">
+              {{dataForm.idCard}}
+      </el-form-item>
+          <el-form-item label="自我介绍：" prop="introduceInfo" label-width="100px">
+              {{dataForm.introduceInfo}}
+      </el-form-item>
+        <el-form-item label="志愿组织：" prop="volunteerOrgNames" label-width="100px">
+            {{dataForm.volunteerOrgNames}}
+        </el-form-item>
+          <el-form-item label="审核状态：" prop="stateName" label-width="100px">
+              {{dataForm.stateName}}
+      </el-form-item>
+          <el-form-item label="审核理由：" prop="reason" label-width="100px">
+              {{dataForm.reason}}
+      </el-form-item>
+<!--          <el-form-item label="用户ID" prop="userId">-->
+<!--          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="头像地址" prop="url">-->
+<!--          <el-input v-model="dataForm.url" placeholder="头像地址"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="党员标识：0否1是" prop="partyFlag">-->
+<!--          <el-input v-model="dataForm.partyFlag" placeholder="党员标识：0否1是"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="部门ID" prop="deptId">-->
+<!--          <el-input v-model="dataForm.deptId" placeholder="部门ID"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="部门名称" prop="deptName">-->
+<!--          <el-input v-model="dataForm.deptName" placeholder="部门名称"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="所有部门ID" prop="allDeptIds">-->
+<!--          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="所有部门名称" prop="allDeptNames">-->
+<!--          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="父所有部门" prop="parentDeptIds">-->
+<!--          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="父所有部门" prop="parentDeptNames">-->
+<!--          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="删除标识 0-否，1-是" prop="delFlag">-->
+<!--          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0-否，1-是"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="乐观锁" prop="revision">-->
+<!--          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建人" prop="createdBy">-->
+<!--          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建时间" prop="createdTime">-->
+<!--          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新人" prop="updatedBy">-->
+<!--          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新时间" prop="updatedTime">-->
+<!--          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>-->
+<!--      </el-form-item>-->
       </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">{{ $t('返回') }}</el-button>
+<!--      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>-->
     </template>
   </el-dialog>
 </template>
@@ -107,69 +110,69 @@ export default {
   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' }
-        ],
-        describe: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        state: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        reason: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        userId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        url: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        partyFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        deptId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        deptName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
+        // 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' }
+        // ],
+        // describe: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // state: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // reason: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // userId: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // url: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // partyFlag: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // deptId: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // deptName: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // allDeptIds: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // allDeptNames: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // parentDeptIds: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // parentDeptNames: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // delFlag: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // revision: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ]
       }
     }
   },
diff --git a/src/views/modules/heart/volunteer-handle.vue b/src/views/modules/heart/volunteer-handle.vue
new file mode 100644
index 0000000..087edc3
--- /dev/null
+++ b/src/views/modules/heart/volunteer-handle.vue
@@ -0,0 +1,96 @@
+<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="state" label-width="80px">
+        <el-select @change="changeHandle" v-model="dataForm.state" placeholder="请选择" clearable>
+          <el-option label="通过" value="10"> </el-option>
+          <el-option label="不通过" value="5"> </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核意见" prop="reason">
+        <el-input
+                type="textarea"
+                :rows="3"
+                v-model="dataForm.reason"
+                maxlength="2000"
+                style="width:calc(100% - 110px)"></el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        state: '',
+        reason: ''
+      },
+      isAble: false,
+      isMust:false
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        state: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reason: [
+          { required: this.isMust, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    changeHandle(value){
+      if (value === '5') {
+        this.isMust = true
+      }
+      if (value === '10') {
+        this.isMust = false
+      }
+    },
+    init () {
+      this.visible = true
+      this.isAble = false
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.isAble = true
+        this.$http['post']('/heart/volunteer/handleApply', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            this.isAble = false
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.$emit('connectResponse')
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/volunteer.vue b/src/views/modules/heart/volunteer.vue
index 875ad70..6dd39c3 100644
--- a/src/views/modules/heart/volunteer.vue
+++ b/src/views/modules/heart/volunteer.vue
@@ -2,47 +2,65 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__volunteer}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="志愿组织" prop="volunteerOrgId">
+          <el-select v-model="dataForm.volunteerOrgId" clearable placeholder="志愿组织">
+            <el-option v-for="item in volunteerOrgList" :key="item.id" :label="item.volunteerOrgName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="状态" prop="state">
+          <el-select v-model="dataForm.state" clearable placeholder="状态">
+            <el-option v-for="item in stateSituation" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="电话" prop="mobile">
+          <el-input v-model="dataForm.mobile"
+                    placeholder="电话"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('heart:volunteer:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('heart:volunteer:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary"
+                     @click="exportHandle()">导出</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="id" label="主键" header-align="center" align="center"></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="describe" label="自我介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="state" label="认证状态：0审核中 1审核通过 2审核驳回" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="reason" label="审核理由" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="url" label="头像地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="partyFlag" label="党员标识：0否1是" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptIds" 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="delFlag" label="删除标识 0-否，1-是" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" 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 type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+<!--        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
+        <el-table-column prop="realName" label="姓名" width=100 header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="电话" width=120 header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="身份证" width=170 header-align="center" align="center"></el-table-column>
+        <el-table-column prop="introduceInfo" label="自我介绍" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="volunteerOrgNames" label="志愿组织" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="stateName" label="审核状态" width=80 header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="reason" label="审核理由" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="url" label="头像地址" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="partyFlag" label="党员标识：0否1是" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="parentDeptIds" 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="delFlag" label="删除标识 0-否，1-是" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updatedBy" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('heart:volunteer:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('heart:volunteer:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+<!--            <el-button v-if="$hasPermission('heart:volunteer:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
+<!--            <el-button v-if="$hasPermission('heart:volunteer:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
+              <el-button v-if="scope.row.state==='0'" type="text" size="small" @click="openHandle(scope.row.id)">{{ $t('审核') }}</el-button>
+              <el-button v-if="scope.row.state==='5' || scope.row.state==='10'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('查看') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -57,6 +75,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <volunteer-handle v-if="handleVisible" ref="volunteerHandle" @refreshDataList="getDataList"></volunteer-handle>
     </div>
   </el-card>
 </template>
@@ -64,6 +83,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './volunteer-add-or-update'
+import VolunteerHandle from './volunteer-handle'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -72,15 +92,42 @@ export default {
         getDataListURL: '/heart/volunteer/page',
         getDataListIsPage: true,
         deleteURL: '/heart/volunteer',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/heart/volunteer/export'
       },
       dataForm: {
         id: ''
-      }
+      },
+        handleVisible:false,
+      stateSituation: [
+        {dictValue: '0', dictName: '未审核'},
+        {dictValue: '5', dictName: '未通过'},
+        {dictValue: '10', dictName: '通过'},
+      ],
+      volunteerOrgList:[]
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    VolunteerHandle
+  },
+  created: function () {
+    this.getVolunteerOrgList()
+  },
+  methods: {
+    getVolunteerOrgList() {
+      this.$http.get(`heart/volunteerorg/getVolunteerOrgList`).then(({data: res}) => {
+        this.volunteerOrgList = res.data
+      }).catch(() => {
+      })
+    },
+      openHandle (id) {
+          this.handleVisible = true
+          this.$nextTick(() => {
+              this.$refs.volunteerHandle.dataForm.id = id
+              this.$refs.volunteerHandle.init()
+          })
+      }
   }
 }
 </script>
diff --git a/src/views/modules/heart/volunteerorg.vue b/src/views/modules/heart/volunteerorg.vue
index 7d7d0e6..7712d35 100644
--- a/src/views/modules/heart/volunteerorg.vue
+++ b/src/views/modules/heart/volunteerorg.vue
@@ -15,7 +15,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
-                     @click="exportHandle()">信息导出</el-button>
+                     @click="exportHandle()">导出</el-button>
         </el-form-item>
 <!--        <el-form-item>-->
 <!--          <el-button v-if="$hasPermission('heart:volunteerorg:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->