|
|
@@ -123,13 +123,16 @@
|
|
|
<a-input style="width: 70%" :maxLength="30" placeholder="请输入开户行" v-decorator="['bankAddr', {initialValue:'招商银行'}]" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="8" :lg="8" >
|
|
|
- <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <j-dict-select-tag style="width: 70%" v-decorator="['type', {initialValue:2,rules: [{ required: true, message: '请选择类型'}]}]" :triggerChange="true" placeholder="请选择上班类型"
|
|
|
- dictCode="type" />
|
|
|
- </a-form-item>
|
|
|
|
|
|
+ <a-col :md="6" :sm="8" :lg="8">
|
|
|
+ <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <j-dict-select-tag style="width: 70%" v-decorator="[ 'employmentStatus', {initialValue:40,rules: [{ required: true, message: '请选择状态'}]}]" placeholder="请选择人员类别"
|
|
|
+ dictCode="employmentStatus" :triggerChange="true"/>
|
|
|
+
|
|
|
+ </a-form-item>
|
|
|
</a-col>
|
|
|
+
|
|
|
+
|
|
|
</a-row>
|
|
|
|
|
|
<a-row>
|
|
|
@@ -242,22 +245,23 @@
|
|
|
<a-row>
|
|
|
<a-col :md="6" :sm="8" :lg="8">
|
|
|
<a-form-item label="是否打卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <a-select style="width: 70%" v-decorator="['isAttendance',{initialValue:'0'}]" placeholder="请选择"
|
|
|
- :getPopupContainer="(target) => target.parentNode">
|
|
|
+ <a-select style="width: 70%" @change="isAttes" v-decorator="['isAttendance',{initialValue:'0'}]" 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-col>
|
|
|
-
|
|
|
- <a-col :md="6" :sm="8" :lg="8">
|
|
|
- <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <j-dict-select-tag style="width: 70%" v-decorator="[ 'employmentStatus', {initialValue:40,rules: [{ required: true, message: '请选择状态'}]}]" placeholder="请选择人员类别"
|
|
|
- dictCode="employmentStatus" :triggerChange="true"/>
|
|
|
-
|
|
|
+ <a-col :md="6" :sm="8" :lg="8" v-if="isatt=='0'||isatt==0">
|
|
|
+ <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <j-dict-select-tag style="width: 70%" v-decorator="['type', {initialValue:2,rules: [{ required: true, message: '请选择类型'}]}]" :triggerChange="true" placeholder="请选择上班类型"
|
|
|
+ dictCode="type" />
|
|
|
</a-form-item>
|
|
|
+
|
|
|
</a-col>
|
|
|
+
|
|
|
+
|
|
|
<a-col :md="6" :sm="8" :lg="8">
|
|
|
<a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-badge :count="fileLists.length" show-zero :number-style="{ backgroundColor: '#52c41a' }">
|
|
|
@@ -373,6 +377,7 @@
|
|
|
drawerWidth: 700,
|
|
|
statet:true,
|
|
|
titles: "新增员工",
|
|
|
+ isatt:'0',
|
|
|
visibles: false,
|
|
|
isEdit:false,
|
|
|
worMoth:0,
|
|
|
@@ -765,6 +770,9 @@
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ isAttes(e){
|
|
|
+ this.isatt=e;
|
|
|
+ },
|
|
|
queryFiles(e) {
|
|
|
getAction(this.url.sysFile, {
|
|
|
userid: e
|
|
|
@@ -895,6 +903,7 @@
|
|
|
this.cEndDate=moment(d).format('YYYY-MM-DD');
|
|
|
}if(record.isAttendance!=null&& record.isAttendance != ""){
|
|
|
this.isAttendance=record.isAttendance;
|
|
|
+ this.isatt=record.isAttendance;
|
|
|
}if(record.workMoth!=null&&record.workMoth!=""){
|
|
|
this.worMoth=record.workMoth;
|
|
|
this.workMoth=record.workMoth - 0+this.moth - 0;
|
|
|
@@ -1018,6 +1027,7 @@
|
|
|
this.moth=0;
|
|
|
this.cEndDate=null;
|
|
|
this.statet=true;
|
|
|
+ this.isatt='0';
|
|
|
},
|
|
|
moment,
|
|
|
handleSubmit() {
|
|
|
@@ -1242,6 +1252,7 @@
|
|
|
callback()
|
|
|
} else {
|
|
|
var date= this.form.getFieldValue('entryDate');
|
|
|
+ console.log(this.statet)
|
|
|
if(date!=null&&this.statet==true){
|
|
|
var da=new Date(date);
|
|
|
if(value==1){
|
|
|
@@ -1255,7 +1266,7 @@
|
|
|
this.cEndDate=moment(da).subtract(1, "days");
|
|
|
}
|
|
|
|
|
|
- }else{
|
|
|
+ }else if(date==null){
|
|
|
callback("请输入入职日期!")
|
|
|
}
|
|
|
callback()
|
LiGuang