From 5253c8bd5ecd2fecd8fefe6b7c7728e3058db5d3 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 15 三月 2021 15:36:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/selectuser.vue | 92 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index 5e0d2e3..6871d56 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -1,33 +1,58 @@
<template>
<div id="mainDiv">
<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-form>
+ <el-row style="height: 45px;">
+ <el-col :span="10">
+ <el-form-item label="关键字">
+ <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:200px" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10" style="height: 100%;">
+ <el-form-item label="员工状态">
+ <el-checkbox-group v-model="queryParams.empStatus">
+ <el-checkbox :label="0">在职</el-checkbox>
+ <el-checkbox :label="1">离职</el-checkbox>
+ <el-checkbox :label="2">退休</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-button size="mini" class="hr-but-all" type="primary" @click="vagueSearch">查询</el-button>
+ <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: right;height: 45px;line-height: 45px">
+ <el-button type="primary" @click="sureChoose">确定</el-button>
+ <el-button type="danger" @click="cancleChoose">取消</el-button>
+ </el-row>
+ </el-form>
</el-header>
<el-main>
<el-table
ref="multipleTable"
:data="list"
row-key="prop1"
- width="50%"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+ stripe
+ border
+ style="width: 100%;color: #000;"
@selection-change="handleSelectionChange"
@row-dblclick="rowDblclick"
+ @sort-change="changeSort"
>
- <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-column show-overflow-tooltip type="selection" :reserve-selection="false" width="50" />
+ <el-table-column v-if="show" show-overflow-tooltip prop="empId" label="员工Id" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="110" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
+ <el-table-column v-if="show" show-overflow-tooltip prop="deptId" label="部门Id" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="400" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column v-if="show" show-overflow-tooltip prop="jobId" label="岗位Id" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empTypeName" label="员工类别" width="80" />
+ <el-table-column show-overflow-tooltip prop="sexName" label="性别" width="60" />
</el-table>
<!--
page.sync 当前页
@@ -41,8 +66,7 @@
: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>
@@ -68,11 +92,12 @@
multipleSelection: [],
total: 0, // 总数量
queryParams: {
- empNumb: ''
+ baseKey: '',
+ empStatus: []
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
- size: 20,
+ size: 15,
num: 1
},
list: [], // 给table显示的数据
@@ -88,18 +113,29 @@
methods: {
// 翻页方法
search() {
- this.queryParams.empName = this.queryParams.empNumb
- this.queryParams.deptName = this.queryParams.empNumb
- this.queryParams.delFlag = 0
this.fetch({
...this.queryParams,
...this.sort
})
},
+ vagueSearch() {
+ this.fetch({
+ baseKey: this.queryParams.baseKey,
+ empStatus: this.queryParams.empStatus
+ })
+ },
+ resetSearch() {
+ this.queryParams = {
+ baseKey: '',
+ empStatus: []
+ }
+ this.search()
+ },
fetch(params = {}) {
var that = this
params.pageSize = this.pagination.size
params.pageNum = this.pagination.num
+ params.delFlag = 0
this.$get('hr/empBaseInfo/list', {
...params
}).then((r) => {
@@ -127,6 +163,12 @@
},
rowDblclick(row, column, event) {
this.$refs.multipleTable.toggleRowSelection(row, true)
+ this.sureChoose()
+ },
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
}
}
}
--
Gitblit v1.8.0