bonus
/
gz-att-web-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.0.75:3000/bonus/gz-att-web-new into dev

This commit is contained in:
fl 2025-03-17 09:10:59 +08:00
parent f1071495e1 83cb38d33d
commit d912e5b390
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/report/attReport/index.vue
View File

@ -740,14 +740,16 @@ export default {
let paramList = [] let paramList = []
let hasError = false let hasError = false
let hasChanges = false; let hasChanges = false;
let isErrorMsg = '';
this.dialogList.forEach((newItem, index) => { this.dialogList.some((newItem, index) => {
const oldItem = this.dialogListOld[index] const oldItem = this.dialogListOld[index]
// 检查toWorkAttCurrentTime或toWorkAttStatus是否改变 // 检查toWorkAttCurrentTime或toWorkAttStatus是否改变
if ((newItem.toWorkAttCurrentTime !== oldItem.toWorkAttCurrentTime || newItem.toWorkAttStatus !== oldItem.toWorkAttStatus) && if ((newItem.toWorkAttCurrentTime !== oldItem.toWorkAttCurrentTime || newItem.toWorkAttStatus !== oldItem.toWorkAttStatus) &&
(!newItem.toErrorRemake || newItem.toErrorRemake === '' || !this.hasAttachments(newItem.filesVoList, '1') )) { (!newItem.toErrorRemake || newItem.toErrorRemake === '' || !this.hasAttachments(newItem.filesVoList, '1') )) {
hasError = true hasError = true
this.$message({ message: '上班时间或状态改变时，原因说明、附件不能为空！', type: 'warning' }) // this.$message({ message: '上班时间或状态改变时，原因说明、附件不能为空！', type: 'warning' })
isErrorMsg = '上班时间或状态改变时，原因说明、附件不能为空！';
return true;
} }
if(newItem.toErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '1')){ if(newItem.toErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '1')){
@ -758,7 +760,9 @@ export default {
if ((newItem.offWorkAttCurrentTime !== oldItem.offWorkAttCurrentTime || newItem.offWorkAttStatus !== oldItem.offWorkAttStatus) && if ((newItem.offWorkAttCurrentTime !== oldItem.offWorkAttCurrentTime || newItem.offWorkAttStatus !== oldItem.offWorkAttStatus) &&
(!newItem.offErrorRemake || newItem.offErrorRemake === '' || !this.hasAttachments(newItem.filesVoList, '2') )) { (!newItem.offErrorRemake || newItem.offErrorRemake === '' || !this.hasAttachments(newItem.filesVoList, '2') )) {
hasError = true hasError = true
this.$message({ message: '下班时间或状态改变时，原因说明、附件不能为空！', type: 'warning' }) // this.$message({ message: '下班时间或状态改变时，原因说明、附件不能为空！', type: 'warning' })
isErrorMsg = '下班时间或状态改变时，原因说明、附件不能为空！';
return true;
} }
if(newItem.offErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '2')){ if(newItem.offErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '2')){
@ -783,6 +787,9 @@ export default {
paramList.push(obj) paramList.push(obj)
} }
}) })
if(isErrorMsg){
return this.$message({ message: isErrorMsg, type: 'warning' })
}
console.log("aa=",paramList) console.log("aa=",paramList)
if(!hasChanges){ if(!hasChanges){
this.$message({ message: '没有数据变化，无需更新！', type: 'info' }); this.$message({ message: '没有数据变化，无需更新！', type: 'info' });