From 7369fd5866a78cde7ecbb4721d9decdfa181fd39 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 15:34:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/selectuser.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index e8bec7e..8cca936 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :span="10">
<el-form-item label="关键字">
- <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" />
+ <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:200px" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -32,14 +32,15 @@
width="80%"
@selection-change="handleSelectionChange"
@row-dblclick="rowDblclick"
+ @sort-change="changeSort"
>
<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="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="护卫点" width="180" />
+ <el-table-column prop="allDeptName" label="护卫点" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column v-if="show" prop="jobId" label="岗位Id" />
<el-table-column prop="jobName" label="岗位" />
<el-table-column prop="empTypeName" label="员工类别" />
@@ -84,12 +85,12 @@
multipleSelection: [],
total: 0, // 总数量
queryParams: {
- empNumb: '',
+ baseKey: '',
empStatus: []
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
- size: 10,
+ size: 15,
num: 1
},
list: [], // 给table显示的数据
@@ -112,16 +113,14 @@
},
vagueSearch() {
this.fetch({
- empNumb: this.queryParams.empNumb,
- empName: this.queryParams.empNumb,
- deptName: this.queryParams.empNumb
+ baseKey: this.queryParams.baseKey,
+ empStatus: this.queryParams.empStatus
})
},
resetSearch() {
this.queryParams = {
- empNumb: '',
- empName: '',
- deptName: ''
+ baseKey: '',
+ empStatus: []
}
this.search()
},
@@ -158,6 +157,11 @@
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