diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue index 125927b..5d9725e 100644 --- a/src/views/report/attReport/index.vue +++ b/src/views/report/attReport/index.vue @@ -743,25 +743,30 @@ export default { let hasError = false let hasChanges = false; - this.dialogList.forEach((newItem, index) => { const oldItem = this.dialogListOld[index] // 检查toWorkAttCurrentTime或toWorkAttStatus是否改变 if ((newItem.toWorkAttCurrentTime !== oldItem.toWorkAttCurrentTime || newItem.toWorkAttStatus !== oldItem.toWorkAttStatus) && (!newItem.toErrorRemake || newItem.toErrorRemake === '' || !this.hasAttachments(newItem.filesVoList, '1') )) { hasError = true - hasChanges = true; this.$message({ message: '上班时间或状态改变时,原因说明、附件不能为空!', type: 'warning' }) } + if(newItem.toErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '1')){ + hasChanges = true + } + // 检查offWorkAttCurrentTime或offWorkAttStatus是否改变 if ((newItem.offWorkAttCurrentTime !== oldItem.offWorkAttCurrentTime || newItem.offWorkAttStatus !== oldItem.offWorkAttStatus) && - (!newItem.offErrorRemake || newItem.offErrorRemake === '' || !this.hasAttachments(newItem.filesVoList, '1') )) { + (!newItem.offErrorRemake || newItem.offErrorRemake === '' || !this.hasAttachments(newItem.filesVoList, '2') )) { hasError = true - hasChanges = true; this.$message({ message: '下班时间或状态改变时,原因说明、附件不能为空!', type: 'warning' }) } + if(newItem.offErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '2')){ + hasChanges = true + } + // 如果没有错误,则构建参数对象 if (!hasError) { let obj = {