From df340393a25892fa333813b3e6c544561895017e Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 13:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/outemployess.vue | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 4df8f2e..2225f7a 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>
@@ -1248,7 +1238,7 @@
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
- size: 12,
+ size: 15,
num: 1
},
headerHeight: '30px',
@@ -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