|
@@ -48,8 +48,8 @@
|
|
|
|
|
|
<a-form-item label="婚否" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-select v-decorator="['nmarriage', {}]" placeholder="请选择性别">
|
|
|
- <a-select-option :value="1">是</a-select-option>
|
|
|
- <a-select-option :value="2">否</a-select-option>
|
|
|
+ <a-select-option value="1">是</a-select-option>
|
|
|
+ <a-select-option value="0">否</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
|
|
@@ -80,14 +80,19 @@
|
|
|
</a-form-item>
|
|
|
|
|
|
<a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <a-input placeholder="请输入学历" v-decorator="['neducation', {}]" />
|
|
|
+ <j-dict-select-tag
|
|
|
+ v-decorator="['neducation', {}]"
|
|
|
+ placeholder="请选择学历"
|
|
|
+ :triggerChange="true"
|
|
|
+ dictCode="education"
|
|
|
+ />
|
|
|
</a-form-item>
|
|
|
|
|
|
<a-form-item label="毕业时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-date-picker
|
|
|
style="width: 100%"
|
|
|
placeholder="请选择毕业时间"
|
|
|
- v-decorator="['ngraduationTime', { initialValue: !model.ngraduationTime ? null : moment(model.ngraduationTime, dateFormat) }]"
|
|
|
+ v-decorator="['nGraduationTime', { initialValue: !model.nGraduationTime ? null : moment(model.nGraduationTime, dateFormat) }]"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
|
|
@@ -100,7 +105,7 @@
|
|
|
<a-date-picker
|
|
|
style="width: 100%"
|
|
|
placeholder="请选择入司日期"
|
|
|
- v-decorator="['ninductionTime', { initialValue: !model.ninductionTime ? null : moment(model.ninductionTime, dateFormat) }]"
|
|
|
+ v-decorator="['nInductionTime', { initialValue: !model.nInductionTime ? null : moment(model.nInductionTime, dateFormat) }]"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
|
|
@@ -173,7 +178,12 @@
|
|
|
</a-form-item>
|
|
|
|
|
|
<a-form-item label="民族" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <a-input placeholder="请输入民族" v-decorator="['nnation', {}]" />
|
|
|
+ <j-dict-select-tag
|
|
|
+ v-decorator="['nnation', {}]"
|
|
|
+ placeholder="请选择民族"
|
|
|
+ :triggerChange="true"
|
|
|
+ dictCode="nation"
|
|
|
+ />
|
|
|
</a-form-item>
|
|
|
|
|
|
<a-form-item label="籍贯" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
@@ -209,7 +219,12 @@
|
|
|
</a-form-item> -->
|
|
|
|
|
|
<a-form-item label="人员类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <a-input placeholder="请输入" v-decorator="['npersonnelType', {}]" />
|
|
|
+ <j-dict-select-tag
|
|
|
+ v-decorator="['npersonnelType', {}]"
|
|
|
+ placeholder="请选择人员类型"
|
|
|
+ :triggerChange="true"
|
|
|
+ dictCode="personnel-status"
|
|
|
+ />
|
|
|
</a-form-item>
|
|
|
<a-form-item label="所属公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<j-dict-select-tag
|