From 59dfdf8276202020f5b179df48b95784d73d7392 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 11 三月 2021 16:48:39 +0800
Subject: [PATCH] fix(bug修复): 部门选择
---
src/views/user/search.vue | 23 +++++++++++++++--------
src/views/user/Informationinput.vue | 6 ++++++
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 031f11e..03296f5 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -795,6 +795,7 @@
:clear-value-text="$t('common.clear')"
placeholder="请选择部门(护卫点)"
style="width:100%"
+ @select="DeptNameSelect"
/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
@@ -5838,6 +5839,11 @@
}, jobNameSelect(item) {
this.empBaseInfoForm.jobName = item.value
this.empBaseInfoForm.JobId = item.code
+ }, DeptNameSelect(val) {
+ debugger
+ this.empBaseInfoForm.deptId = val.deptId
+ this.empBaseInfoForm.deptName = val.label
+ this.empBaseInfoForm.allDeptName = val.allDeptName
},
generateUserInfo(index, val) {
var userinfo = toCardGetUserInfo(val)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 77d36c4..f898ba2 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -268,12 +268,13 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 100%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
@@ -287,8 +288,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="dimissionTypeName" label="离职类型" width="100" />
- <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" />
- <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
</el-table>
<el-dialog title="导出员工" :visible.sync="dialogShowDcyg" width="40%" style="font-weight: 700;">
<div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">请勾选需要导出的字段</div>
@@ -525,14 +526,15 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
:data="workExperienceData"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="220" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="80" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip prop="workUnit" label="工作单位" width="220" />
- <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="endDate" label="结束日期" width="150" />
<el-table-column show-overflow-tooltip prop="jobContent" label="主要工作内容" />
</el-table>
@@ -2892,6 +2894,11 @@
case 3:
return '调动'
}
+ },
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
}
}
}
--
Gitblit v1.8.0