From 9d15b75340506c0c9bf0fdd384ebb2c3dbd1ee63 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 24 Sep 2021 16:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heart/vactorgtype-add-or-update.vue       |  96 ++++-----
 src/views/modules/heart/vactorgtype.vue       |  41 ++--
 .../heart/volunteerorg-add-or-update.vue      | 129 ++++++++++--
 src/views/modules/heart/volunteerorg-look.vue | 194 ++++++++++++++++++
 src/views/modules/heart/volunteerorg.vue      |  64 +++++-
 5 files changed, 426 insertions(+), 98 deletions(-)
 create mode 100644 src/views/modules/heart/volunteerorg-look.vue

diff --git a/src/views/modules/heart/vactorgtype-add-or-update.vue b/src/views/modules/heart/vactorgtype-add-or-update.vue
index 2a04fdd..4b330ef 100644
--- a/src/views/modules/heart/vactorgtype-add-or-update.vue
+++ b/src/views/modules/heart/vactorgtype-add-or-update.vue
@@ -1,33 +1,33 @@
 <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="typeName">
-          <el-input v-model="dataForm.typeName" placeholder="类别名称"></el-input>
-      </el-form-item>
-          <el-form-item label="类别编码" prop="typeCode">
-          <el-input v-model="dataForm.typeCode" placeholder="类别编码"></el-input>
-      </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+          <el-form-item label="组织类型" prop="typeName">
+          <el-input v-model="dataForm.typeName" maxlength="10" placeholder="组织类型，10字以内" ></el-input>
       </el-form-item>
+<!--          <el-form-item label="类别编码" prop="typeCode">-->
+<!--          <el-input v-model="dataForm.typeCode" placeholder="类别编码"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="排序" prop="sort">-->
+<!--              <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序"></el-input-number>-->
+<!--      </el-form-item>-->
           <el-form-item label="备注" prop="note">
-          <el-input v-model="dataForm.note" 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="creator">
-          <el-input v-model="dataForm.creator" placeholder="创建者"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新者" prop="updater">
-          <el-input v-model="dataForm.updater" placeholder="更新者"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="更新时间"></el-input>
+          <el-input v-model="dataForm.note" type="textarea"  maxlength="50" placeholder="输入内容，50字以内" ></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="creator">-->
+<!--          <el-input v-model="dataForm.creator" placeholder="创建者"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建时间" prop="createDate">-->
+<!--          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新者" prop="updater">-->
+<!--          <el-input v-model="dataForm.updater" placeholder="更新者"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新时间" prop="updateDate">-->
+<!--          <el-input v-model="dataForm.updateDate" placeholder="更新时间"></el-input>-->
+<!--      </el-form-item>-->
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -62,30 +62,30 @@ export default {
         typeName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        typeCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        note: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        creator: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createDate: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updater: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updateDate: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
+        // typeCode: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // sort: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // note: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // delFlag: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // creator: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createDate: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updater: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updateDate: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ]
       }
     }
   },
diff --git a/src/views/modules/heart/vactorgtype.vue b/src/views/modules/heart/vactorgtype.vue
index 78a7217..82d0f46 100644
--- a/src/views/modules/heart/vactorgtype.vue
+++ b/src/views/modules/heart/vactorgtype.vue
@@ -2,35 +2,38 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__vactorgtype}">
       <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>-->
+<!--        <el-form-item>-->
+<!--          <el-button @click="getDataList()">{{ $t('query') }}</el-button>-->
+<!--        </el-form-item>-->
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" 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:vactorgtype: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:vactorgtype: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 prop="typeName" label="类别名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="typeCode" label="类别编码" 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 type="index"
+                         width="50"
+                         label="序号" 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 prop="typeName" label="组织类型" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="typeCode" label="类别编码" 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="note" 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="creator" label="创建者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updater" label="更新者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" 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="creator" label="创建者" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updater" label="更新者" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updateDate" 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:vactorgtype:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('heart:vactorgtype: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>
diff --git a/src/views/modules/heart/volunteerorg-add-or-update.vue b/src/views/modules/heart/volunteerorg-add-or-update.vue
index 611dadb..07c9a0f 100644
--- a/src/views/modules/heart/volunteerorg-add-or-update.vue
+++ b/src/views/modules/heart/volunteerorg-add-or-update.vue
@@ -1,13 +1,19 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? '新增公益组织' : $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-form-item label="组织类型" prop="orgType" label-width="100px">
+            <el-select v-model="dataForm.orgType" clearable placeholder="组织类型" style="width:300px">
+                <el-option v-for="item in orgTypeList" :key="item.id" :label="item.typeName" :value="item.id">
+                </el-option>
+            </el-select>
+        </el-form-item>
+          <el-form-item label="组织名称" prop="volunteerOrgName"  label-width="100px">
           <el-input v-model="dataForm.volunteerOrgName" placeholder="组织名称" style="width:300px"></el-input>
       </el-form-item>
-        <el-form-item label="负责人" prop="headName">
+        <el-form-item label="组织管理员" prop="headName" label-width="100px">
             <el-input v-model="dataForm.headName" placeholder="负责人" style="width:300px"></el-input>
         </el-form-item>
-        <el-form-item label="负责电话" prop="mobile">
+        <el-form-item label="管理员电话" prop="mobile" label-width="100px">
             <el-input v-model="dataForm.mobile" placeholder="负责电话" style="width:300px"></el-input>
         </el-form-item>
 <!--          <el-form-item label="组织编码" prop="volunteerOrgCode">-->
@@ -16,21 +22,38 @@
 <!--          <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-form-item label="是否启用" prop="isOpen" label-width="100px">
             <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-form-item prop="sort" label="排序" label-width="100px">
             <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-form-item label="照片"
+                      label-width="100px"
+                      v-loading="loading"
+                      prop="imgUrl">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :on-success="handleAvatarSuccess"
+                       :before-upload="beforeAvatarUpload">
+                <img v-if="dataForm.imgUrl"
+                     :src="dataForm.imgUrl"
+                     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="address" label-width="100px">
           <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 label="组织介绍" prop="note" label-width="100px">
+            <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>-->
@@ -60,6 +83,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
 export default {
   data () {
     return {
@@ -81,6 +105,9 @@ export default {
         updatedTime: '',
           note:''
       },
+        uploadUrl: '',
+        loading: false,
+        orgTypeList:[],
         isOpenList: [
             {dictValue: '0', dictName: '启用'},
             {dictValue: '1', dictName: '禁用'},
@@ -90,6 +117,9 @@ export default {
   computed: {
     dataRule () {
       return {
+          orgType: [
+              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          ],
         volunteerOrgName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -105,13 +135,19 @@ export default {
         headName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+          imgUrl: [
+              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          ],
+          note: [
+              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          ],
         mobile: [
           { 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' }
         ],
-        // address: [
-        //   { 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' }
         // ],
@@ -133,7 +169,27 @@ export default {
       }
     }
   },
+    created: function () {
+        this.getOrgTypeList()
+        this.$nextTick(() => {
+            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+        })
+    },
   methods: {
+      // 上传图片
+      handleAvatarSuccess (res, file) {
+          this.loading = false
+          this.dataForm.imgUrl = res.data.url
+      },
+      beforeAvatarUpload (file) {
+          this.loading = true
+      },
+      getOrgTypeList() {
+          this.$http.get(`heart/vactorgtype/getOrgTypeList`).then(({data: res}) => {
+              this.orgTypeList = res.data
+          }).catch(() => {
+          })
+      },
     init () {
       this.visible = true
       this.$nextTick(() => {
@@ -165,18 +221,49 @@ export default {
           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')
-            }
-          })
+          this.$alert(res.data, '提示', {
+              confirmButtonText: '确定',
+              callback: action => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+              } });
+          // 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>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/heart/volunteerorg-look.vue b/src/views/modules/heart/volunteerorg-look.vue
new file mode 100644
index 0000000..f713ca2
--- /dev/null
+++ b/src/views/modules/heart/volunteerorg-look.vue
@@ -0,0 +1,194 @@
+<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="orgType" label-width="100px">
+<!--            <el-select v-model="dataForm.orgType" clearable placeholder="组织类型" style="width:300px">-->
+<!--                <el-option v-for="item in orgTypeList" :key="item.id" :label="item.typeName" :value="item.id">-->
+<!--                </el-option>-->
+<!--            </el-select>-->
+                {{getTypeName(dataForm.orgType)}}
+        </el-form-item>
+          <el-form-item label="组织名称：" prop="volunteerOrgName"  label-width="100px">
+              {{dataForm.volunteerOrgName}}
+      </el-form-item>
+        <el-form-item label="组织管理员：" prop="headName" label-width="100px">
+            {{dataForm.headName}}
+        </el-form-item>
+        <el-form-item label="管理员电话：" prop="mobile" label-width="100px">
+            {{dataForm.mobile}}
+        </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" label-width="100px">
+            <template slot-scope="scope">
+                {{
+                dataForm.isOpen == 0
+                ? "启用"
+                : dataForm.isOpen == 1
+                ? "禁用"
+                : ""
+                }}
+            </template>
+        </el-form-item>
+        <el-form-item prop="sort" label="排序：" label-width="100px">
+            {{dataForm.sort}}
+        </el-form-item>
+        <el-form-item label="照片："
+                      label-width="100px"
+                      v-loading="loading"
+                      prop="imgUrl">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :disabled="true">
+                <img v-if="dataForm.imgUrl"
+                     :src="dataForm.imgUrl"
+                     class="avatar">
+                <i v-else
+                   class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+        </el-form-item>
+          <el-form-item label="地址：" prop="address" label-width="100px">
+              {{dataForm.address}}
+      </el-form-item>
+        <el-form-item label="组织介绍：" prop="note" label-width="100px">
+            {{dataForm.note}}
+        </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>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        volunteerOrgName: '',
+        volunteerOrgCode: '',
+        isOpen: '',
+        sort: '',
+        headName: '',
+        mobile: '',
+        address: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+          note:''
+      },
+        uploadUrl: '',
+        loading: false,
+        orgTypeList:[],
+        isOpenList: [
+            {dictValue: '0', dictName: '启用'},
+            {dictValue: '1', dictName: '禁用'},
+        ]
+    }
+  },
+  computed: {
+      getTypeName(orgType){
+          return function(orgType){
+              let typeName;
+              this.orgTypeList.forEach(item =>{
+                 if(item.id == orgType){
+                     typeName =  item.typeName;
+                 }
+               })
+              return typeName;
+          }
+      },
+    dataRule () {
+      return {
+      }
+    }
+  },
+    created: function () {
+        this.getOrgTypeList()
+    },
+  methods: {
+      getOrgTypeList() {
+          this.$http.get(`heart/vactorgtype/getOrgTypeList`).then(({data: res}) => {
+              this.orgTypeList = res.data
+          }).catch(() => {
+          })
+      },
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/volunteerorg/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+  }
+}
+</script>
+<style>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/heart/volunteerorg.vue b/src/views/modules/heart/volunteerorg.vue
index 7712d35..f9ee9e3 100644
--- a/src/views/modules/heart/volunteerorg.vue
+++ b/src/views/modules/heart/volunteerorg.vue
@@ -2,11 +2,28 @@
   <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 label="组织名称" prop="volunteerOrgName">
+      <el-form-item label="组织类型" prop="orgType" label-width="80px">
+          <el-select v-model="dataForm.orgType" clearable placeholder="组织类型">
+              <el-option v-for="item in orgTypeList" :key="item.id" :label="item.typeName" :value="item.id">
+              </el-option>
+          </el-select>
+      </el-form-item>
+        <el-form-item label="组织名称" prop="volunteerOrgName" label-width="80px">
           <el-input v-model="dataForm.volunteerOrgName"
                     placeholder="组织名称"
                     clearable></el-input>
         </el-form-item>
+          <br>
+          <el-form-item label="负责人" prop="headName" label-width="80px">
+              <el-input v-model="dataForm.headName"
+                        placeholder="负责人"
+                        clearable></el-input>
+          </el-form-item>
+          <el-form-item label="电话" prop="mobile" label-width="80px">
+              <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>
@@ -27,13 +44,15 @@
                          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="orgTypeName" 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="volunteerO rgCode" 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="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="associatedStates" 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>-->
@@ -42,6 +61,7 @@
 <!--        <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 type="text" size="small" @click="lookDetail(scope.row.id)">{{ $t('详情') }}</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>
@@ -58,6 +78,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <volunteerorg-look v-if="lookVisible" ref="volunteerorgLook" @refreshDataList="getDataList"></volunteerorg-look>
     </div>
   </el-card>
 </template>
@@ -65,6 +86,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './volunteerorg-add-or-update'
+import VolunteerorgLook from './volunteerorg-look'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -77,12 +99,34 @@ export default {
         exportURL: '/heart/volunteerorg/export'
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+          orgType:''
+      },
+      lookVisible:false,
+      orgTypeList:[]
     }
   },
+    created: function () {
+        this.getOrgTypeList()
+    },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+    VolunteerorgLook
+  },
+    methods: {
+        lookDetail (id) {
+            this.lookVisible = true
+            this.$nextTick(() => {
+                this.$refs.volunteerorgLook.dataForm.id = id
+                this.$refs.volunteerorgLook.init()
+            })
+        },
+        getOrgTypeList() {
+            this.$http.get(`heart/vactorgtype/getOrgTypeList`).then(({data: res}) => {
+                this.orgTypeList = res.data
+            }).catch(() => {
+            })
+        },
+    }
+    }
 </script>