From 10c46d5535a4c186dc2077cc3d47b6f6c1bb2d3a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 09 三月 2021 11:56:58 +0800
Subject: [PATCH] fix(bug修复): 在职员工导出excel
---
src/views/user/inemployees.vue | 30 +++++++++++++++---------------
src/views/user/outemployess.vue | 20 +++++---------------
2 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index d3d848c..17119d5 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -797,9 +797,9 @@
</td>
</tr>
<tr>
- <td>员工类型</td>
+ <td>家庭成员及关系</td>
<td>
- <el-checkbox label="empTypeName"><span /></el-checkbox>
+ <el-checkbox label="family"><span /></el-checkbox>
</td>
<td>员工状态</td>
<td>
@@ -817,7 +817,7 @@
</td>
<td>保险类型</td>
<td>
- <el-checkbox label="InsuranceTypeName"><span /></el-checkbox>
+ <el-checkbox label="insuranceTypeName"><span /></el-checkbox>
</td>
<td>社保电脑号</td>
<td>
@@ -835,7 +835,7 @@
</td>
<td>工作证</td>
<td>
- <el-checkbox label="empCardStatus"><span /></el-checkbox>
+ <el-checkbox label="empCardStatusName"><span /></el-checkbox>
</td>
</tr>
<tr>
@@ -852,16 +852,16 @@
<el-checkbox label="handbookStatusName"><span /></el-checkbox>
</td>
</tr>
- <tr>
- <td>家庭成员及关系</td>
- <td>
- <el-checkbox label="family"><span /></el-checkbox>
- </td>
- <td />
- <td />
- <td />
- <td />
- </tr>
+ <!-- <tr>-->
+ <!-- <td>家庭成员及关系</td>-->
+ <!-- <td>-->
+ <!-- <el-checkbox label="family"><span /></el-checkbox>-->
+ <!-- </td>-->
+ <!-- <td />-->
+ <!-- <td />-->
+ <!-- <td />-->
+ <!-- <td />-->
+ <!-- </tr>-->
</el-checkbox-group>
</table>
<div slot="footer" class="dialog-footer">
@@ -1113,7 +1113,7 @@
exportUrl: '',
checkAll: false,
isIndeterminate: false,
- 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', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empTypeName', 'empStatusName', 'dimissionDate'],
+ 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'],
checkedCities: [],
tableData: [],
selectDimissionType: 1,
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 4df8f2e..89ed5d0 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -1134,9 +1134,9 @@
</td>
</tr>
<tr>
- <td>员工类型</td>
+ <td>家庭成员及关系</td>
<td>
- <el-checkbox label="empTypeName"><span /></el-checkbox>
+ <el-checkbox label="family"><span /></el-checkbox>
</td>
<td>员工状态</td>
<td>
@@ -1154,7 +1154,7 @@
</td>
<td>保险类型</td>
<td>
- <el-checkbox label="InsuranceTypeName"><span /></el-checkbox>
+ <el-checkbox label="insuranceTypeName"><span /></el-checkbox>
</td>
<td>社保电脑号</td>
<td>
@@ -1172,7 +1172,7 @@
</td>
<td>工作证</td>
<td>
- <el-checkbox label="empCardStatus"><span /></el-checkbox>
+ <el-checkbox label="empCardStatusName"><span /></el-checkbox>
</td>
</tr>
<tr>
@@ -1188,16 +1188,6 @@
<td>
<el-checkbox label="handbookStatusName"><span /></el-checkbox>
</td>
- </tr>
- <tr>
- <td>家庭成员及关系</td>
- <td>
- <el-checkbox label="family"><span /></el-checkbox>
- </td>
- <td />
- <td />
- <td />
- <td />
</tr>
</el-checkbox-group>
</table>
@@ -1274,7 +1264,7 @@
archivesStatusOptions: [],
sexOptions: [],
empTypeOptions: [],
- 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', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empTypeName', 'empStatusName', 'dimissionDate'],
+ 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', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empTypeName', 'empStatusName', 'dimissionDate'],
checkedCities: []
}
},
--
Gitblit v1.8.0