diff --git a/src/views/modules/heart/volunteerorg-add-or-update.vue b/src/views/modules/heart/volunteerorg-add-or-update.vue
index a26c076..ca9dcb8 100644
--- a/src/views/modules/heart/volunteerorg-add-or-update.vue
+++ b/src/views/modules/heart/volunteerorg-add-or-update.vue
@@ -1,45 +1,55 @@
 <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="volunteerOrgName">
-          <el-input v-model="dataForm.volunteerOrgName" placeholder="组织名称"></el-input>
-      </el-form-item>
-          <el-form-item label="组织编码" prop="volunteerOrgCode">
-          <el-input v-model="dataForm.volunteerOrgCode" placeholder="组织编码"></el-input>
-      </el-form-item>
-          <el-form-item label="是否启用：0启用 1禁用" prop="isOpen">
-          <el-input v-model="dataForm.isOpen" placeholder="是否启用：0启用 1禁用"></el-input>
-      </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
-      </el-form-item>
-          <el-form-item label="负责人" prop="headName">
-          <el-input v-model="dataForm.headName" placeholder="负责人"></el-input>
-      </el-form-item>
-          <el-form-item label="负责电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="负责电话"></el-input>
+          <el-form-item label="组织名称" prop="volunteerOrgName" >
+          <el-input v-model="dataForm.volunteerOrgName" placeholder="组织名称" style="width:300px"></el-input>
       </el-form-item>
+        <el-form-item label="负责人" prop="headName">
+            <el-input v-model="dataForm.headName" placeholder="负责人" style="width:300px"></el-input>
+        </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="volunteerOrgCode">-->
+<!--          <el-input v-model="dataForm.volunteerOrgCode" placeholder="组织编码"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="是否启用" prop="isOpen">-->
+<!--          <el-input v-model="dataForm.isOpen" placeholder="是否启用"></el-input>-->
+<!--      </el-form-item>-->
+        <el-form-item label="是否启用" prop="isOpen">
+            <el-select v-model="dataForm.isOpen" clearable placeholder="是否启用" style="width:300px">
+                <el-option v-for="item in isOpenList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item prop="sort" label="排序">
+            <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序" style="width:300px"></el-input-number>
+        </el-form-item>
+
           <el-form-item label="地址" prop="address">
-          <el-input v-model="dataForm.address" 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-input v-model="dataForm.address" clearable="" maxlength="200" placeholder="请输入地址，最多200字"></el-input>
       </el-form-item>
+        <el-form-item label="备注" prop="note">
+            <el-input v-model="dataForm.note" clearable type="textarea" maxlength="200" placeholder="请输入备注，最多200字"></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>
@@ -68,8 +78,13 @@ export default {
         createdBy: '',
         createdTime: '',
         updatedBy: '',
-        updatedTime: ''
-      }
+        updatedTime: '',
+          note:''
+      },
+        isOpenList: [
+            {dictValue: '0', dictName: '启用'},
+            {dictValue: '1', dictName: '禁用'},
+        ]
     }
   },
   computed: {
@@ -78,42 +93,43 @@ export default {
         volunteerOrgName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        volunteerOrgCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        isOpen: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+        // volunteerOrgCode: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // isOpen: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // sort: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
         headName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        address: [
-          { 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' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+            { pattern: /^[1][1,2,3,4,5,6,7,8,9][0-9]{9}$/, message: '请输入正确号码格式', 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' }
-        ]
+        // address: [
+        //   { 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/volunteerorg.vue b/src/views/modules/heart/volunteerorg.vue
index 97d6f13..7d7d0e6 100644
--- a/src/views/modules/heart/volunteerorg.vue
+++ b/src/views/modules/heart/volunteerorg.vue
@@ -2,39 +2,48 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__volunteerorg}">
       <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="volunteerOrgName">
+          <el-input v-model="dataForm.volunteerOrgName"
+                    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('heart:volunteerorg:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button  type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('heart:volunteerorg:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary"
+                     @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>-->
+<!--        </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 type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
+<!--        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="volunteerOrgName" label="组织名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="volunteerOrgCode" label="组织编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="isOpen" label="是否启用：0启用 1禁用" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="volunteerOrgCode" label="组织编码" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="isOpen" label="是否启用：0启用 1禁用" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="headName" 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="address" 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 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:volunteerorg:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('heart:volunteerorg:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
@@ -64,7 +73,8 @@ export default {
         getDataListURL: '/heart/volunteerorg/page',
         getDataListIsPage: true,
         deleteURL: '/heart/volunteerorg',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/heart/volunteerorg/export'
       },
       dataForm: {
         id: ''