修复邮箱匹配规则bug和用户搜索下拉展示手机号邮箱

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

@@ -69,8 +69,12 @@
       <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-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 }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px; margin:0 20px 0 10px;">{{ user.id }}</span>
+            <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>
@@ -133,7 +137,7 @@ import { mapGetters } from 'vuex'
 // import _ from 'lodash'
 const DAY_TIMESTAMP = 8.64e7
 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-]+$/
+const EMAIL_REG = /^[A-Za-z0-9]+([_.][A-Za-z0-9]+)*@[A-Za-z0-9-.]+$/
 export default {
   props: {
     data: {

src/pages/system/account/index.vue

@@ -23,8 +23,12 @@
           <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-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 }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px; margin-left:10px;">{{ user.id }}</span>
+                <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-form-item>
@@ -52,7 +56,7 @@ import { getAccountList, searchUserList, createAccount, updateAccount, deleteAcc
 import { mapGetters } from 'vuex'
 import _ from 'lodash'
 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-]+$/
+const EMAIL_REG = /^[A-Za-z0-9]+([_.][A-Za-z0-9]+)*@[A-Za-z0-9-.]+$/
 export default {
   data () {
     const checkMobile = (rule, value, callback) => {