|
@@ -218,13 +218,13 @@
|
|
|
|
|
|
<a-form-item label="社保基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-input placeholder="请输入社保基数" v-decorator="['nsocialBase',{}]" />
|
|
|
- </a-form-item>
|
|
|
-
|
|
|
+ </a-form-item>
|
|
|
+
|
|
|
<a-form-item label="社保申报日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-date-picker
|
|
|
style="width: 100%"
|
|
|
placeholder="请选择社保申报日期"
|
|
|
- v-decorator="['nsocialTime', { initialValue: !model.nsocialTime ? null : moment(model.nsocialTime, dateFormat) }]"
|
|
|
+ v-decorator="['nSocialTime', { initialValue: !model.nSocialTime ? null : moment(model.nSocialTime, dateFormat) }]"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
<a-form-item label="社保断缴日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
@@ -242,7 +242,7 @@
|
|
|
<a-date-picker
|
|
|
style="width: 100%"
|
|
|
placeholder="请选择公积金申报日期"
|
|
|
- v-decorator="['nfundTime', { initialValue: !model.nfundTime ? null : moment(model.nfundTime, dateFormat) }]"
|
|
|
+ v-decorator="['nFundTime', { initialValue: !model.nFundTime ? null : moment(model.nFundTime, dateFormat) }]"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
<a-form-item label="公积金断缴日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
@@ -673,8 +673,8 @@ export default {
|
|
|
'ncardNo',
|
|
|
'nvirtualNo',
|
|
|
'nBecomeTime',
|
|
|
- 'nsocialTime',
|
|
|
- 'nfundTime',
|
|
|
+ 'nSocialTime',
|
|
|
+ 'nFundTime',
|
|
|
'nfundBase',
|
|
|
'nsocialBase',
|
|
|
'nannualNum',
|
|
@@ -695,7 +695,11 @@ export default {
|
|
|
'syResignationTime',
|
|
|
'syFundOutTime',
|
|
|
'sySecurityOutTime',
|
|
|
- 'licenseCar'
|
|
|
+ 'licenseCar',
|
|
|
+ 'nresume',
|
|
|
+ 'nmemberOfFamily',
|
|
|
+ 'nremarks'
|
|
|
+
|
|
|
)
|
|
|
)
|
|
|
})
|
|
@@ -794,6 +798,7 @@ export default {
|
|
|
formData.selecteddeparts =
|
|
|
this.userDepartModel.departIdList.length > 0 ? this.userDepartModel.departIdList.join(',') : ''
|
|
|
formData.identity = this.identity
|
|
|
+ debugger
|
|
|
// 如果是上级择传入departIds,否则为空
|
|
|
if (this.identity === '2') {
|
|
|
formData.departIds = this.departIds.join(',')
|