From bd0708640f2685414b5548cdf4059f7aaeaf96a6 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 10 二月 2021 01:27:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/selectuser.vue | 101 +++++++++++++++++++++-----------------------------
1 files changed, 43 insertions(+), 58 deletions(-)
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index 8685e9b..a061894 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -1,61 +1,49 @@
<template>
<div id="mainDiv">
- <el-container>
- <el-header :height="headerHeight">
- <el-row>
- <el-col :span="5">员工编号：
- <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:80px" />
- </el-col>
- <el-col :span="4">姓名：
- <el-input v-model="queryParams.empName" placeholder="请输入内容" style="width:80px" />
- </el-col>
- <el-col :span="4">护卫点：
- <el-input v-model="queryParams.deptName" placeholder="请输入内容" style="width:80px" />
- </el-col>
- <el-col :span="4">
- <el-button type="primary" @click="search">查询</el-button>
- </el-col>
- </el-row>
- </el-header>
- <el-container>
- <el-main>
- <el-table
- ref="multipleTable"
- :data="list"
- row-key="prop1"
- width="50%"
- @selection-change="handleSelectionChange"
- @row-dblclick="rowDblclick"
- >
- <el-table-column type="selection" :reserve-selection="false" width="55" />
- <el-table-column v-if="show" prop="empId" label="员工Id" />
- <el-table-column prop="empNumb" label="员工编号" />
- <el-table-column prop="empName" label="姓名" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column v-if="show" prop="deptId" label="部门Id" />
- <el-table-column prop="deptName" label="护卫点" />
- <el-table-column v-if="show" prop="jobId" label="岗位Id" />
- <el-table-column prop="jobName" label="岗位" />
- <el-table-column prop="empTypeName" label="员工类别" />
- <el-table-column prop="sexName" label="性别" width="50" />
- </el-table>
- <!--
+ <el-header :height="headerHeight">
+ <el-row>
+ <el-col :span="8">
+ <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" />
+ <el-button type="primary" @click="search">查询</el-button>
+ </el-col>
+ </el-row>
+ </el-header>
+ <el-main>
+ <el-table
+ ref="multipleTable"
+ :data="list"
+ row-key="prop1"
+ width="50%"
+ @selection-change="handleSelectionChange"
+ @row-dblclick="rowDblclick"
+ >
+ <el-table-column type="selection" :reserve-selection="false" width="55" />
+ <el-table-column v-if="show" prop="empId" label="员工Id" />
+ <el-table-column prop="empNumb" label="员工编号" />
+ <el-table-column prop="empName" label="姓名" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column v-if="show" prop="deptId" label="部门Id" />
+ <el-table-column prop="deptName" label="护卫点" />
+ <el-table-column v-if="show" prop="jobId" label="岗位Id" />
+ <el-table-column prop="jobName" label="岗位" />
+ <el-table-column prop="empTypeName" label="员工类别" />
+ <el-table-column prop="sexName" label="性别" width="50" />
+ </el-table>
+ <!--
page.sync 当前页
limit.sync 每页显示数量 只能是5，10，20，30，50
pagination 翻页的事件
-->
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="pagination.num"
- :limit.sync="pagination.size"
- @pagination="search"
- />
- <el-button type="primary" @click="sureChoose">确定</el-button>
- <el-button type="danger" @click="cancleChoose">取消</el-button>
- </el-main>
- </el-container>
- </el-container>
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="pagination.num"
+ :limit.sync="pagination.size"
+ @pagination="search"
+ />
+ <el-button type="primary" @click="sureChoose">确定</el-button>
+ <el-button type="danger" @click="cancleChoose">取消</el-button>
+ </el-main>
</div>
</template>
<script>
@@ -97,7 +85,9 @@
},
methods: {
// 翻页方法
- search() {
+ search() {
+ this.queryParams.empName = this.queryParams.empNumb
+ this.queryParams.deptName = this.queryParams.empNumb
this.fetch({
...this.queryParams,
...this.sort
@@ -139,11 +129,6 @@
}
</script>
<style lang="scss" scoped>
- #mainDiv {
- height: 550px;
- overflow: scroll;
- }
-
.link_button {
color: #169BD5;
}
--
Gitblit v1.8.0