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/search.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 5c22ae7..77d36c4 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -271,10 +271,10 @@
>
<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="deptName" label="(部门)护卫点" width="140" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
<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="certificateNumb" label="身份证号码" width="150" />
+ <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" />
<el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
@@ -317,7 +317,7 @@
<tr>
<td>部门(护卫点)</td>
<td>
- <el-checkbox label="deptName"><span /></el-checkbox>
+ <el-checkbox label="allDeptName"><span /></el-checkbox>
</td>
<td>所属岗位</td>
<td>
@@ -451,7 +451,7 @@
</td>
<td>工作证</td>
<td>
- <el-checkbox label="empCardStatus"><span /></el-checkbox>
+ <el-checkbox label="empCardStatusName"><span /></el-checkbox>
</td>
</tr>
<tr>
@@ -844,7 +844,7 @@
<el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
- <!-- <el-table-column prop="deptName" label="护卫点" width="180" />
+ <!-- <el-table-column prop="allDeptName" label="护卫点" width="180" />
<el-table-column prop="jobName" label="岗位" width="180" />
<el-table-column prop="empName" label="姓名" width="180" />
<el-table-column prop="certificateNumb" label="身份证号码" width="180" />
@@ -1938,7 +1938,7 @@
},
data() {
return {
- cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
+ cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
dialogShowDcyg: false,
isIndeterminate: false,
checkedCities: [],
--
Gitblit v1.8.0