diff --git a/src/views/setting/rules/index.vue b/src/views/setting/rules/index.vue index 7a445aa..81da230 100644 --- a/src/views/setting/rules/index.vue +++ b/src/views/setting/rules/index.vue @@ -190,10 +190,10 @@ - - - - + + + + @@ -681,6 +681,7 @@ export default { this.form.absenteeismLateMinute = undefined; //旷工迟到分钟 this.form.absenteeismLeaveMinute = undefined; //旷工早退分钟 this.form.entryAbnormalMinute = undefined; //出入异常时间 + this.form.isHaveHoliday = "1"; } if (v == 2) { this.form.attDays = [0, 1, 2, 3, 4, 5, 6]; @@ -689,6 +690,7 @@ export default { this.form.attRange = 300; this.form.absenteeismLateMinute = undefined; //旷工迟到分钟 this.form.absenteeismLeaveMinute = undefined; //旷工早退分钟 + this.form.isHaveHoliday = "0"; } }, clockNum(v) { @@ -731,6 +733,7 @@ export default { todayClockNum: undefined, attendanceDuration: undefined, attRange: undefined, + isHaveHoliday: "1" }; this.resetForm("form"); }, @@ -775,6 +778,14 @@ export default { const groupId = row.groupId; getAttGroup(groupId).then((response) => { 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) { this.form.toWorkTime = this.setData(this.form.toWorkTime); }