Merge branch 'master' of http://git.datuai.com/luoyibo/ykt-web

src/api/system/user/types.ts

@@ -15,7 +15,7 @@ export interface UserInfo {
  */
 export interface UserQuery extends PageQuery {
   userName?: string;
-  phonenumber?: string;
+  phone?: string;
   status?: string;
   deptId?: string | number;
   roleId?: string | number;
@@ -62,7 +62,7 @@ export interface UserForm {
   userName: string;
   nickName?: string;
   password: string;
-  phonenumber?: string;
+  phone?: string;
   email?: string;
   sex?: string;
   status: string;

src/views/system/role/authUser.vue

@@ -6,8 +6,8 @@
           <el-form-item label="用户名称" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -38,7 +38,7 @@
         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -90,7 +90,7 @@ const queryParams = reactive<UserQuery>({
   pageSize: 10,
   roleId: route.params.roleId as string,
   userName: undefined,
-  phonenumber: undefined
+  phone: undefined
 });
 
 /** 查询授权用户列表 */

src/views/system/role/selectUser.vue

@@ -5,8 +5,8 @@
         <el-form-item label="用户名" prop="userName">
           <el-input v-model="queryParams.userName" placeholder="请输入用户名" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="手机号码" prop="phonenumber">
-          <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+        <el-form-item label="手机号码" prop="phone">
+          <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -19,7 +19,7 @@
           <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
           <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-          <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+          <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
           <el-table-column label="状态" align="center" prop="status">
             <template #default="scope">
               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -68,7 +68,7 @@ const queryParams = reactive<UserQuery>({
   pageSize: 10,
   roleId: undefined,
   userName: undefined,
-  phonenumber: undefined
+  phone: undefined
 });
 
 const tableRef = ref<ElTableInstance>();

src/views/system/user/profile/index.vue

@@ -19,7 +19,7 @@
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="phone" />手机号码
-                <div class="pull-right">{{ state.user.phonenumber }}</div>
+                <div class="pull-right">{{ state.user.phone }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="email" />用户邮箱

src/views/system/user/profile/userInfo.vue

@@ -3,8 +3,8 @@
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="userForm.nickName" maxlength="30" />
     </el-form-item>
-    <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="userForm.phonenumber" maxlength="11" />
+    <el-form-item label="手机号码" prop="phone">
+      <el-input v-model="userForm.phone" maxlength="11" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
       <el-input v-model="userForm.email" maxlength="50" />
@@ -42,7 +42,7 @@ const rule: ElFormRules = {
       trigger: ['blur', 'change']
     }
   ],
-  phonenumber: [
+  phone: [
     {
       required: true,
       message: '手机号码不能为空',