From e6505dfd6607c8fbc2e89ebf7cb5c66179ee77d4 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 17:11:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/selectuser.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index 9bcba1a..e8bec7e 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -17,8 +17,9 @@
</el-checkbox-group>
</el-form-item>
</el-col>
- <el-col :span="2">
- <el-button type="primary" @click="search">查询</el-button>
+ <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>
@@ -28,17 +29,17 @@
ref="multipleTable"
:data="list"
row-key="prop1"
- width="50%"
+ width="80%"
@selection-change="handleSelectionChange"
@row-dblclick="rowDblclick"
>
- <el-table-column type="selection" :reserve-selection="false" width="55" />
+ <el-table-column type="selection" :reserve-selection="false" width="50" />
<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 prop="deptName" label="护卫点" width="180" />
<el-table-column v-if="show" prop="jobId" label="岗位Id" />
<el-table-column prop="jobName" label="岗位" />
<el-table-column prop="empTypeName" label="员工类别" />
@@ -104,18 +105,31 @@
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({
+ empNumb: this.queryParams.empNumb,
+ empName: this.queryParams.empNumb,
+ deptName: this.queryParams.empNumb
+ })
+ },
+ resetSearch() {
+ this.queryParams = {
+ empNumb: '',
+ empName: '',
+ deptName: ''
+ }
+ 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) => {
@@ -143,6 +157,7 @@
},
rowDblclick(row, column, event) {
this.$refs.multipleTable.toggleRowSelection(row, true)
+ this.sureChoose()
}
}
}
--
Gitblit v1.8.0