From 7e75e6e21e6ce58271f7fa10b6bcc1226208e89d Mon Sep 17 00:00:00 2001
From: liuchuang <liuchuang@elink-cn.com>
Date: Wed, 14 Jul 2021 16:17:52 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=89=80=E5=B1=9E=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/volunteerinfo.vue | 34 ++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 40e2e5d..2db56df 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -26,6 +26,16 @@
                     placeholder="昵称"
                     clearable></el-input>
         </el-form-item>
+        <el-form-item label="所属部门">
+          <el-select v-model="dataForm.volunteerDeptId" placeholder="请选择" clearable>
+            <el-option
+                v-for="item in volunteerDepts"
+                :key="item.id"
+                :label="item.deptName"
+                :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
           <el-button @click="exportList()">{{ $t('export') }}</el-button>
@@ -88,6 +98,10 @@
                          :formatter="kindnessTimeState"
                          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="points"
                          label="积分"
                          header-align="center"
@@ -194,7 +208,8 @@ export default {
         communityId: null,
         gridId: null,
         leaderFlag: '0',
-        volunteerOrder: ''
+        volunteerOrder: '',
+        volunteerDeptId: ''
       },
       auditStatusType: 0,
       deptIdList: [],
@@ -202,10 +217,12 @@ export default {
       volunteerinfoDetailVisible: false,
       volunteerinfoPointsAdjustVisible: false,
       volunteerPointsLogVisible: false,
-      volunteerinfoCheckVisible: false
+      volunteerinfoCheckVisible: false,
+      volunteerDepts: []
     }
   },
   created () {
+    this.getVolunteerDepts()
     this.$http
       .get(`/sys/user/deptOptions/getByLoginUser`)
       .then(({ data: res }) => {
@@ -241,6 +258,19 @@ export default {
     }
   },
   methods: {
+    // 获取信息
+    getVolunteerDepts () {
+      this.$http.get(`/app-user/volunteerdept/volunteerdepts`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.volunteerDepts = {
+          ...this.volunteerDepts,
+          ...res.data
+        }
+        console.log(JSON.stringify(this.volunteerDepts))
+      }).catch(() => {})
+    },
     // 查看
     userDetailHandle (userId) {
       this.volunteerinfoDetailVisible = true