From c695c32a2bb103a4d91d0c3e40efe4410ae77759 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 27 二月 2021 18:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/selectuser.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index 3357493..e8bec7e 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -1,13 +1,28 @@
<template>
<div id="mainDiv">
<el-header :height="headerHeight">
- <el-row>
- <el-col :span="24">
- <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" />
- <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-form>
+ <el-row>
+ <el-col :span="10">
+ <el-form-item label="关键字">
+ <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <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-form>
</el-header>
<el-main>
<el-table
@@ -69,7 +84,8 @@
multipleSelection: [],
total: 0, // 总数量
queryParams: {
- empNumb: ''
+ empNumb: '',
+ empStatus: []
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
--
Gitblit v1.8.0