qinzhipeng_v@didiglobal.com %!s(int64=4) %!d(string=hai) anos
pai
achega
84fe6f9f85
Modificáronse 2 ficheiros con 55 adicións e 9 borrados
  1. 18 0
      src/api/toConfigure.js
  2. 37 9
      src/views/ToConfigure/components/MemberDetails.vue

+ 18 - 0
src/api/toConfigure.js

@@ -141,3 +141,21 @@ export function teamAddMemberToGroup(data) {
     data
   })
 }
+
+// 全部成员搜索
+export function getMembersBelowBiz(data) {
+  return request({
+    url: TeamManagement + `/setting/getMembersBelowBiz`,
+    method: 'post',
+    data
+  })
+}
+
+// 未加入团队成员搜索
+export function getMembersWithoutTeam(data) {
+  return request({
+    url: TeamManagement + `/setting/getMembersWithoutTeam`,
+    method: 'post',
+    data
+  })
+}

+ 37 - 9
src/views/ToConfigure/components/MemberDetails.vue

@@ -1,17 +1,20 @@
 <template>
   <el-container>
     <div class="team_space_between">
-      <div style="flex: 0.5;display: flex; justify-content: space-start;">
+      <div style="flex: 1;display: flex; justify-content: space-start;">
         <div class="team_title">{{ titleName === '全部成员' || titleName === '未加入团队的成员' ? '成员' : '团队' }}-{{ titleName }} </div>
-        <el-input v-model="member_query_name" placeholder="请输入内容" style="width: 200px">
-          <el-button slot="append" icon="el-icon-search" />
-        </el-input>
+        <searchPeople :value.sync="member_query_name" :size="'medium'" placeholder="人员筛选框" style="width: 30%; line-height: 40px;" @change="getMenber(member_query_name)" />
       </div>
       <el-button v-if="titleName === '全部成员' || titleName === '未加入团队的成员'" type="primary" size="mini" icon="el-icon-plus" @click="setMember({}, '添加成员')">添加成员</el-button>
       <el-button v-else type="primary" size="mini" icon="el-icon-plus" @click="setTeamMember">添加团队成员</el-button>
     </div>
     <el-main>
-      <el-table :data="AllMember" max-height="610" :header-cell-style="{ backgroundColor: '#F4F4F4', color: '#444444', fontSize: '14px', fontWeight: '500'}">
+      <div v-if="addMember" align="center">
+        <div>人员不是{{ titleName === '全部成员' ? '业务线' : '团队' }}成员!
+          <el-button v-if="titleName === '全部成员' || titleName === '未加入团队的成员'" type="text" size="mini" @click="setMember({}, '添加成员')">添加成员</el-button>
+        </div>
+      </div>
+      <el-table v-if="!addMember" :data="AllMember" max-height="610" :header-cell-style="{ backgroundColor: '#F4F4F4', color: '#444444', fontSize: '14px', fontWeight: '500'}">
         <el-table-column prop="date" label="姓名" min-width="200">
           <template slot-scope="scope">
             <div style="display: flex; justify-content: flex-start;">
@@ -56,7 +59,7 @@
       </el-table>
     </el-main>
     <el-footer style="text-align: right;">
-      <el-pagination :current-page.sync="currentPage" :page-size="10" layout="total, prev, pager, next" :total="total" background @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+      <el-pagination v-if="!addMember" :current-page.sync="currentPage" :page-size="10" layout="total, prev, pager, next" :total="total" background @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </el-footer>
     <memberSetup v-if="memberSetupShow" :data="member_information" @update="settingGetMembersBelowBiz" />
     <teamMember v-if="teamMemberSetupShow" :data="type" @update="settingGetMembersBelowBiz" />
@@ -65,14 +68,16 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { teamQueryTeamInfo, settingGetMembersBelowBiz, settingGetMembersWithoutTeam } from '@/api/toConfigure.js'
+import { teamQueryTeamInfo, settingGetMembersBelowBiz, settingGetMembersWithoutTeam, getMembersBelowBiz, getMembersWithoutTeam } from '@/api/toConfigure.js'
 import memberSetup from './memberSetup.vue'
 import teamMember from './AddTeamMembers.vue'
+import searchPeople from '@/components/select/searchPeople' // 人员select
 
 export default {
   components: {
     memberSetup,
-    teamMember
+    teamMember,
+    searchPeople
   },
   props: {
     data: { type: [String, Object], required: true }
@@ -89,6 +94,7 @@ export default {
       teamMemberSetupShow: false, // 添加团队成员loading
       member_information: {},
       titleName: '全部成员',
+      addMember: false,
       AllMember: [] // 全部成员
     }
   },
@@ -117,6 +123,7 @@ export default {
   methods: {
     async settingGetMembersBelowBiz() {
       if (this.bizId === -1) return
+      this.addMember = false
       if (this.type === 'all') {
         this.titleName = '全部成员'
         const res = await settingGetMembersBelowBiz({ bizId: this.bizId, pageSize: this.pageSize, curIndex: this.curIndex })
@@ -149,6 +156,24 @@ export default {
       this.teamMemberSetupShow = false
       this.$emit('update')
     },
+    async getMenber(menber) {
+      if (this.type === 'all') {
+        const data = { bizId: this.bizId, people: menber }
+        const res = await getMembersBelowBiz(data)
+        if (res.code === 200 && res.data[0]) {
+          this.AllMember = res.data
+          this.addMember = false
+        } else {
+          this.addMember = true
+        }
+      } else if (this.type === 'not') {
+        const data = { bizId: this.bizId, memberIDAP: menber, pageSize: 10, curIndex: 1 }
+        const res = await getMembersWithoutTeam(data)
+        if (res.code === 200) this.AllMember = res.data
+      }
+
+      console.log(menber)
+    },
     setMember(data, name) { // 团队成员移除。取消负责人。设置负责人
       data.teamName = this.titleName
       this.member_information = {
@@ -184,7 +209,10 @@ export default {
   font-weight: 500;
   color: #444444;
   line-height: 40px;
-  min-width: 250px;
+  margin-right: 20px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .el-dropdown-link {
     cursor: pointer;