Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/system/role/selectUser.vue

@@ -1,43 +1,41 @@
 <template>
   <!-- 授权用户 -->
   <el-dialog title="选择用户" v-model="visible" width="1200px" top="5vh" append-to-body draggable>
-    <el-form :model="queryParams" ref="queryRef" :inline="true">
-      <el-form-item label="用户名称" prop="userName">
-        <el-input v-model.trim="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 200px" @keyup.enter="handleQuery" />
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
+      <el-form-item label="员工姓名：" prop="userName">
+        <el-input v-model.trim="queryParams.userName" placeholder="请输入员工姓名" clearable style="width: 150px" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="手机号码" prop="phonenumber">
-        <el-input v-model.trim="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 200px" @keyup.enter="handleQuery" />
+      <el-form-item label="手机号码：" prop="phonenumber">
+        <el-input v-model.trim="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 150px" @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-row>
-      <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
-        <el-table-column type="selection" width="40"></el-table-column>
-        <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="状态" align="center" prop="status">
+    <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="350px">
+      <el-table-column type="selection" width="40"></el-table-column>
+      <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="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
         </el-table-column> -->
-        <el-table-column label="身份" align="center" prop="tenantAdmin" width="100">
-          <template #default="scope">
-            <dict-tag :options="user_tenant" :value="scope.row.tenantAdmin" />
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-row>
+      <el-table-column label="身份" align="center" prop="tenantAdmin" width="100">
+        <template #default="scope">
+          <dict-tag :options="user_tenant" :value="scope.row.tenantAdmin" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="handleSelectUser">确 定</el-button>