考勤设置添加是否有法定节假日
This commit is contained in:
parent
278381d134
commit
94e3fd1e31
|
|
@ -190,10 +190,10 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="是否有法定节假日:" prop="attType">
|
<el-form-item label="是否有法定节假日:" prop="isHaveHoliday">
|
||||||
<el-radio-group>
|
<el-radio-group v-model="form.isHaveHoliday">
|
||||||
<el-radio label="是">是 </el-radio>
|
<el-radio label="1" key="1">是</el-radio>
|
||||||
<el-radio label="否">否 </el-radio>
|
<el-radio label="0" key="0">否</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -681,6 +681,7 @@ export default {
|
||||||
this.form.absenteeismLateMinute = undefined; //旷工迟到分钟
|
this.form.absenteeismLateMinute = undefined; //旷工迟到分钟
|
||||||
this.form.absenteeismLeaveMinute = undefined; //旷工早退分钟
|
this.form.absenteeismLeaveMinute = undefined; //旷工早退分钟
|
||||||
this.form.entryAbnormalMinute = undefined; //出入异常时间
|
this.form.entryAbnormalMinute = undefined; //出入异常时间
|
||||||
|
this.form.isHaveHoliday = "1";
|
||||||
}
|
}
|
||||||
if (v == 2) {
|
if (v == 2) {
|
||||||
this.form.attDays = [0, 1, 2, 3, 4, 5, 6];
|
this.form.attDays = [0, 1, 2, 3, 4, 5, 6];
|
||||||
|
|
@ -689,6 +690,7 @@ export default {
|
||||||
this.form.attRange = 300;
|
this.form.attRange = 300;
|
||||||
this.form.absenteeismLateMinute = undefined; //旷工迟到分钟
|
this.form.absenteeismLateMinute = undefined; //旷工迟到分钟
|
||||||
this.form.absenteeismLeaveMinute = undefined; //旷工早退分钟
|
this.form.absenteeismLeaveMinute = undefined; //旷工早退分钟
|
||||||
|
this.form.isHaveHoliday = "0";
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
clockNum(v) {
|
clockNum(v) {
|
||||||
|
|
@ -731,6 +733,7 @@ export default {
|
||||||
todayClockNum: undefined,
|
todayClockNum: undefined,
|
||||||
attendanceDuration: undefined,
|
attendanceDuration: undefined,
|
||||||
attRange: undefined,
|
attRange: undefined,
|
||||||
|
isHaveHoliday: "1"
|
||||||
};
|
};
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
|
|
@ -775,6 +778,14 @@ export default {
|
||||||
const groupId = row.groupId;
|
const groupId = row.groupId;
|
||||||
getAttGroup(groupId).then((response) => {
|
getAttGroup(groupId).then((response) => {
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
|
let isHaveHoliday = response.data.isHaveHoliday,attType = response.data.attType;
|
||||||
|
if(isHaveHoliday == null && attType === '1'){
|
||||||
|
this.form.isHaveHoliday = '1'
|
||||||
|
}else if(isHaveHoliday == null && attType === '2'){
|
||||||
|
this.form.isHaveHoliday = '0'
|
||||||
|
}else if(isHaveHoliday!=null){
|
||||||
|
this.form.isHaveHoliday = isHaveHoliday.toString();
|
||||||
|
}
|
||||||
if (this.form.toWorkTime != "" && this.form.toWorkTime != null) {
|
if (this.form.toWorkTime != "" && this.form.toWorkTime != null) {
|
||||||
this.form.toWorkTime = this.setData(this.form.toWorkTime);
|
this.form.toWorkTime = this.setData(this.form.toWorkTime);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue