|
|
@@ -121,9 +121,12 @@
|
|
|
<a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-select v-decorator="[ 'category', {initialValue:101}]" placeholder="请选择人员类别" :getPopupContainer= "(target) => target.parentNode">
|
|
|
<a-select-option :value="101">正式工</a-select-option>
|
|
|
- <a-select-option :value="102">合同工</a-select-option>
|
|
|
<a-select-option :value="103">实习生</a-select-option>
|
|
|
<a-select-option :value="104">劳务工</a-select-option>
|
|
|
+ <a-select-option :value="105">劳务外包5+2</a-select-option>
|
|
|
+ <a-select-option :value="106">劳务外包6+1</a-select-option>
|
|
|
+ <a-select-option :value="102">顾问</a-select-option>
|
|
|
+
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
|
|
|
@@ -149,6 +152,10 @@
|
|
|
<j-image-upload class="avatar-uploader" text="上传" v-model="fileList" ></j-image-upload>
|
|
|
</a-form-item>
|
|
|
|
|
|
+ <a-form-item label="公积金账号" :labelCol="labelCol" :wrapperCol="wrapperCol" >
|
|
|
+ <a-input placeholder="请输入公积金账号" v-model="syFund" @mouseleave="getBirth"/>
|
|
|
+ </a-form-item>
|
|
|
+
|
|
|
<a-form-item label="*身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol" >
|
|
|
<a-input placeholder="请输入身份证号码" v-model="sfzCode" @mouseleave="getBirth"/>
|
|
|
</a-form-item>
|
|
|
@@ -207,6 +214,19 @@
|
|
|
<!-- <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<j-dict-select-tag v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>
|
|
|
</a-form-item> -->
|
|
|
+ <a-form-item label="是否考勤" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-select v-model="isAttendance" placeholder="请选择是否考勤" :getPopupContainer= "(target) => target.parentNode">
|
|
|
+ <a-select-option value="0">是</a-select-option>
|
|
|
+ <a-select-option value="1">否</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
+
|
|
|
+ <a-form-item label="是否算薪" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-select v-model="isSalary" placeholder="请选择是否算薪" :getPopupContainer= "(target) => target.parentNode">
|
|
|
+ <a-select-option value="0">是</a-select-option>
|
|
|
+ <a-select-option value="1">否</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
|
|
|
<a-form-item label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<j-dict-select-tag v-decorator="['infoSy', {initialValue:3}]" placeholder="请选择同步" :type="'radio'" :triggerChange="true" dictCode="info_sy"/>
|
|
|
@@ -255,6 +275,9 @@
|
|
|
drawerWidth:700,
|
|
|
modaltoggleFlag:true,
|
|
|
sfzCode:"",
|
|
|
+ syFund:"",
|
|
|
+ isSalary:"0",
|
|
|
+ isAttendance:"0",
|
|
|
confirmDirty: false,
|
|
|
selectedDepartKeys:[], //保存用户选择部门id
|
|
|
checkedDepartKeys:[],
|
|
|
@@ -468,6 +491,9 @@
|
|
|
this.sfzCode="";
|
|
|
this.realname="";
|
|
|
this.egName="";
|
|
|
+ this.syFund="";
|
|
|
+ this.isAttendance=0;
|
|
|
+ this.isSalary=0;
|
|
|
},
|
|
|
add () {
|
|
|
this.picUrl = "";
|
|
|
@@ -515,6 +541,18 @@
|
|
|
this.realname=record.realname;
|
|
|
this.egName=record.egName;
|
|
|
this.sfzCode=record.sfzCode;
|
|
|
+ if(record.isAttendance==null||record.isAttendance==""){
|
|
|
+ this.isAttendance="0";
|
|
|
+ }else{
|
|
|
+ this.isAttendance=record.isAttendance;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ if(record.isSalary==null||record.isSalary==""){
|
|
|
+ this.isSalary="0";
|
|
|
+ }else{
|
|
|
+ this.isSalary=record.isSalary;
|
|
|
+ }
|
|
|
//update-end-author:taoyan date:2020710 for:多租户配置
|
|
|
},
|
|
|
//
|
|
|
@@ -594,6 +632,10 @@
|
|
|
}else{
|
|
|
formData.avatar = null;
|
|
|
}
|
|
|
+
|
|
|
+ formData.syFund=this.syFund;
|
|
|
+ formData.isAttendance=this.isAttendance;
|
|
|
+ formData.isSalary=this.isSalary;
|
|
|
//update-begin-author:taoyan date:2020710 for:多租户配置
|
|
|
//formData.relTenantIds = this.currentTenant.length>0?this.currentTenant.join(','):''
|
|
|
//update-end-author:taoyan date:2020710 for:多租户配置
|
LiGuang