修改用户搜索提示语

src/pages/meeting/tencent-meeting/components/MeetingForm.vue

@@ -67,7 +67,7 @@
     <el-form-item label="指定会议管理员">
       <p style="line-height:24px;font-size:12px;">(会议管理员有修改会议，复制、取消会议等所有管理本次会议的权限)</p>
       <el-col :span="24">
-        <el-select style="width: 100%" v-model="form.managers" placeholder="输入关键字搜索" size="small" multiple filterable remote :remote-method="fetchUserList" :loading="searchUsersloading" >
+        <el-select style="width: 100%" v-model="form.managers" placeholder="输入邮箱/手机号码搜索" size="small" multiple filterable remote :remote-method="fetchUserList" :loading="searchUsersloading" clearable>
           <el-option :label="user.real_name || user.nickname " :value="user.id" v-for="user in userList" :key="user.id" >
             <span style="float: left">
               {{ user.real_name || user.nickname }}

src/pages/search/index.vue

@@ -25,10 +25,14 @@
         <el-row>
           <el-col :span="8">
             <label>会议创建人</label>
-            <el-select v-model="filter.userid" placeholder="输入关键字搜索" size="mini" filterable remote :remote-method="fetchUserList" :loading="searchUsersloading">
-              <el-option :label="user.username" :value="user.id" v-for="user in userList" :key="user.id" >
-                <span style="float: left">{{ user.username }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px; margin:0 20px 0 10px;">{{ user.id }}</span>
+            <el-select v-model="filter.userid" placeholder="输入邮箱/手机号码搜索" size="mini" filterable remote :remote-method="fetchUserList" :loading="searchUsersloading" clearable>
+              <el-option :label="user.real_name || user.nickname " :value="user.id" v-for="user in userList" :key="user.id" >
+                <span style="float: left">
+                  {{ user.real_name || user.nickname }}
+                  <template v-if="user.mobile">(手机号：{{user.mobile}})</template>
+                </span>
+                <span style="float: right; color: #8492a6; font-size: 13px; margin:0 20px 0 10px;" v-if="user.email">邮箱：{{ user.email }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px; margin:0 20px 0 10px;" v-else>ID：{{ user.id }}</span>
               </el-option>
             </el-select>
           </el-col>
@@ -113,6 +117,8 @@ import TableHandles from '@/components/TableHandles/index.vue'
 import { dateFormat } from '@/utils/dateAlgs'
 import { searchUserList, getMeetingList } from '@api/common'
 import { mapGetters } from 'vuex'
+const MOBILE_REG = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{4,8}$/
+const EMAIL_REG = /^[A-Za-z0-9]+([_.][A-Za-z0-9]+)*@[A-Za-z0-9-.]+$/
 export default {
   data() {
     return {
@@ -201,18 +207,41 @@ export default {
         }
       })
     },
+    // fetchUserList(val) {
+    //   if (val) {
+    //     const params = {
+    //       username: val
+    //     }
+    //     this.searchUsersloading = true;
+    //     searchUserList(params).then((res) => {
+    //       this.searchUsersloading = false;
+    //       if (res.data && Array.isArray(res.data.items)) {
+    //         this.userList = res.data.items
+    //       }
+    //     }).catch(() => {})
+    //   }
+    // }
     fetchUserList(val) {
-      if (val) {
+      let searchType = 'username'
+      if (EMAIL_REG.test(val)) {
+        searchType = 'email'
+      } else if (MOBILE_REG.test(val)) {
+        searchType = 'mobile'
+      }
+      if (!val) return false
+      else {
         const params = {
-          username: val
+          [searchType]: val
         }
-        this.searchUsersloading = true;
-        searchUserList(params).then((res) => {
-          this.searchUsersloading = false;
-          if (res.data && Array.isArray(res.data.items)) {
-            this.userList = res.data.items
-          }
-        }).catch(() => {})
+        this.searchUsersloading = true
+        searchUserList(params)
+          .then(res => {
+            this.searchUsersloading = false
+            if (res.data && Array.isArray(res.data.items)) {
+              this.userList = res.data.items
+            }
+          })
+          .catch(() => {})
       }
     }
   }

src/pages/system/account/index.vue

@@ -21,7 +21,7 @@
             <el-input v-model="form.userid" size="small" disabled></el-input>
           </el-form-item>
           <el-form-item label="ID" prop="userid" v-else>
-            <el-select v-model="form.userid" placeholder="输入关键字搜索" size="small" filterable remote :remote-method="fetchUserList" :loading="searchUsersloading" style="width:310px;">
+            <el-select v-model="form.userid" placeholder="输入邮箱/手机号码搜索" size="small" filterable remote :remote-method="fetchUserList" :loading="searchUsersloading" style="width:310px;">
               <el-option :label="user.real_name || user.nickname " :value="user.id" v-for="user in userList" :key="user.id" >
                 <span style="float: left">
                   {{ user.real_name || user.nickname }}