From c4e5cc5dc481a120c8b13a340901aa826b4205cf Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 三月 2021 15:29:45 +0800
Subject: [PATCH] fix(bug修复): 【在职员工】、【离职员工】、【员工智搜】导出缺少“员工编号“字段
---
src/views/user/search.vue | 6 +++++-
vue.config.js | 2 +-
src/views/user/inemployees.vue | 6 +++++-
src/views/user/outemployess.vue | 6 +++++-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index e10544e..d1b7c4d 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -868,6 +868,10 @@
<td>
<el-checkbox label="dimissionTypeName"><span /></el-checkbox>
</td>
+ <td>编号</td>
+ <td>
+ <el-checkbox label="empNumb"><span /></el-checkbox>
+ </td>
</tr>
<!-- <tr>-->
<!-- <td>家庭成员及关系</td>-->
@@ -1182,7 +1186,7 @@
exportUrl: '',
checkAll: false,
isIndeterminate: false,
- 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', 'entryTypeName', 'dimissionTypeName'],
+ 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', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
checkedCities: [],
tableData: [],
selectDimissionType: 1,
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index d6900cf..7971331 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -1208,6 +1208,10 @@
<td>
<el-checkbox label="dimissionTypeName"><span /></el-checkbox>
</td>
+ <td>编号</td>
+ <td>
+ <el-checkbox label="empNumb"><span /></el-checkbox>
+ </td>
</tr>
</el-checkbox-group>
</table>
@@ -1284,7 +1288,7 @@
archivesStatusOptions: [],
sexOptions: [],
empTypeOptions: [],
- 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', 'entryTypeName', 'dimissionTypeName'],
+ 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', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
checkedCities: []
}
},
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index b5099ba..e876760 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -478,6 +478,10 @@
<td>
<el-checkbox label="dimissionTypeName"><span /></el-checkbox>
</td>
+ <td>编号</td>
+ <td>
+ <el-checkbox label="empNumb"><span /></el-checkbox>
+ </td>
</tr>
</el-checkbox-group>
</table>
@@ -1963,7 +1967,7 @@
},
data() {
return {
- 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', 'entryTypeName', 'dimissionTypeName'],
+ 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', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
dialogShowDcyg: false,
isIndeterminate: false,
checkedCities: [],
diff --git a/vue.config.js b/vue.config.js
index 9023db1..4132a51 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
// change xxx-api/login => mock/login
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://120.24.23.155:7301/',
+ // target: 'http://120.24.23.155:8301/',
target: 'http://127.0.0.1:8301/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.8.0