From 9b4f96767ea488b9e469226885a6d32c7f332f1f Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 18 Nov 2021 17:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E6=88=90=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heart/volunteerteam-relation-user.vue     | 148 ++++++++++++++++++
 src/views/modules/heart/volunteerteam.vue     |  15 +-
 .../modules/user/vlounteerteamrealation.vue   |  18 +--
 3 files changed, 170 insertions(+), 11 deletions(-)
 create mode 100644 src/views/modules/heart/volunteerteam-relation-user.vue

diff --git a/src/views/modules/heart/volunteerteam-relation-user.vue b/src/views/modules/heart/volunteerteam-relation-user.vue
new file mode 100644
index 0000000..77f5c1d
--- /dev/null
+++ b/src/views/modules/heart/volunteerteam-relation-user.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog :visible.sync="visible"
+              append-to-body
+              :close-on-click-modal="false"
+              :close-on-press-escape="false"
+              width="80%"
+              height="90%">
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.realName" placeholder='姓名' clearable maxlength="10" @keyup.native="btKeyUpRealname"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="11" @keyup.native="btKeyUpMobile"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataListOverWrite()" type="success">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" ref="Table" :data="dataList" max-height="450" style="width: 100%;" @selection-change="handleSelectionChange">
+<!--        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+        <el-table-column
+          type="index"
+          header-align="center"
+          align="center"
+          width="50"
+          label='序号'
+        ></el-table-column>
+<!--        <el-table-column prop="nickname" :label="$t('user.username')" sortable="custom" header-align="center" align="center" width="100"></el-table-column>-->
+        <el-table-column prop="realName" label="姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sex" label="性别" header-align="center" align="center" min-width="120"></el-table-column>
+<!--        <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center" width="200"></el-table-column>-->
+        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center" width="120"></el-table-column>
+<!--        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center" width="180">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>-->
+<!--            <el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column prop="createdTime" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></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="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>
+    </div>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/vlounteerteamrealation/getVolunteerListByTeamId',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/vlounteerteamrealation',
+        deleteIsBatch: true
+      },
+      visible: false,
+      dataForm: {
+        realName: '',
+        mobile: '',
+        teamId:''
+      },
+      responseData: []
+    }
+  },
+  methods: {
+    // btKeyUpUserName (e) {
+    //   e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+    //   this.dataForm.username = e.target.value
+    // },
+    btKeyUpRealname (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.realname = e.target.value
+    },
+    // btKeyUpEmail (e) {
+    //   e.target.value = e.target.value.replace(/[`~!#$%^&*()_\-+=<>?:"{}|~！#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
+    //   this.dataForm.email = e.target.value
+    // },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_=<>?:"{}|·~！@#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
+    getDataListOverWrite () {
+      this.page = 1
+      this.getDataList()
+    },
+    // 获取数据列表
+    init () {
+        this.dataForm.realName = ''
+        this.dataForm.mobile = ''
+      this.visible = true
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
+    handleSelectionChange (val) {
+      this.responseData = val
+        if (val.length > 1) {
+            this.$refs.Table.clearSelection()
+            this.$refs.Table.toggleRowSelection(val.pop())
+        }
+
+    },
+    getInfo () {
+      if (this.responseData.length === 0) {
+        this.$message({
+          message: '请选择志愿者！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.$emit('connectResponse', this.responseData)
+      this.visible = false
+    }
+  }
+}
+</script>
+<style scoped lang='scss'>
+.el-form{
+  .end{
+    margin-top: 10px;
+  }
+}
+.el-button--success{
+  margin-top: 0px!important;
+}
+thead .el-table-column--selection .cell{
+    display: none;
+}
+
+</style>
diff --git a/src/views/modules/heart/volunteerteam.vue b/src/views/modules/heart/volunteerteam.vue
index 1890e9d..a4a1409 100644
--- a/src/views/modules/heart/volunteerteam.vue
+++ b/src/views/modules/heart/volunteerteam.vue
@@ -39,6 +39,7 @@
         <el-table-column prop="createdTime" 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="selectVolunteerMethod(scope.row.id)">{{ '成员列表' }}</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>
@@ -55,6 +56,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <volunteerteam-relation-user v-if="relationUserVisible" ref="volunteerteamRelationUser" ></volunteerteam-relation-user>
     </div>
   </el-card>
 </template>
@@ -62,6 +64,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './volunteerteam-add-or-update'
+import VolunteerteamRelationUser from './volunteerteam-relation-user'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -75,16 +78,26 @@ export default {
       dataForm: {
         id: ''
       },
+      relationUserVisible:false,
       teamTypeList:[]
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    VolunteerteamRelationUser
   },
   created: function () {
     this.getTeamTypeList()
   },
   methods: {
+    //选择用户按钮点击事件
+    selectVolunteerMethod (id) {
+      this.relationUserVisible = true
+      this.$nextTick(() => {
+        this.$refs.volunteerteamRelationUser.dataForm.teamId = id
+        this.$refs.volunteerteamRelationUser.init()
+      })
+    },
     getTeamTypeList() {
       this.$http.get(`heart/volunteerteamtype/getTeamTypeList`).then(({data: res}) => {
         this.teamTypeList = res.data
diff --git a/src/views/modules/user/vlounteerteamrealation.vue b/src/views/modules/user/vlounteerteamrealation.vue
index 11a397c..565e62b 100644
--- a/src/views/modules/user/vlounteerteamrealation.vue
+++ b/src/views/modules/user/vlounteerteamrealation.vue
@@ -16,18 +16,16 @@
         </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="volunteerId" label="志愿者id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="teamId" label="团队id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="teamName" label="团队名称" header-align="center" align="center"></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="teamType" label="团队类别" 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="teamName" label="团队名称" header-align="center" align="center"></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="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="删除标识" 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('user:vlounteerteamrealation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>