|
|
@ -148,24 +148,24 @@ |
|
|
|
|
|
|
|
}, |
|
|
|
methods: { |
|
|
|
deleteFileById(id){ |
|
|
|
deleteFileById(id).then(res=>{ |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
deleteFileById(id) { |
|
|
|
deleteFileById(id).then(res => { |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
getFileList(id){ |
|
|
|
getFileList(id) { |
|
|
|
getFileList("jobInspectDetail", id).then(res => { |
|
|
|
if(res.data){ |
|
|
|
res.data.forEach(res=>{ |
|
|
|
if (res.data) { |
|
|
|
res.data.forEach(res => { |
|
|
|
this.deleteFileById(res.id) |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
clearPicList(subList){ |
|
|
|
subList.forEach(item=>{ |
|
|
|
|
|
|
|
clearPicList(subList) { |
|
|
|
subList.forEach(item => { |
|
|
|
this.getFileList(item.id) |
|
|
|
}) |
|
|
|
}, |
|
|
@ -353,23 +353,33 @@ |
|
|
|
|
|
|
|
commit() { |
|
|
|
this.scanCount = getScanCount(this.subList); |
|
|
|
// if (this.scanCount == 0) { |
|
|
|
// this.showErrorMessage("扫描数为0,请先扫描") |
|
|
|
// return; |
|
|
|
// } |
|
|
|
//如果是全检,必须全部扫描-------改为:任务中的是否允许部分提交:nxt 2023年12月13日 |
|
|
|
if (this.jobContent.allowPartialComplete == "TRUE") { |
|
|
|
this.submitJob(); |
|
|
|
|
|
|
|
if (this.scanCount == 0) { |
|
|
|
this.showErrorMessage("扫描数为0,请先扫描") |
|
|
|
return; |
|
|
|
} else { |
|
|
|
//不允许部分提交,提示 |
|
|
|
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + |
|
|
|
"]箱总共[" + this |
|
|
|
.subList.length + "]箱", res => { |
|
|
|
if (res) { |
|
|
|
this.openScanPopup(); |
|
|
|
} |
|
|
|
}); |
|
|
|
if (this.scanCount == this.subList.length) { |
|
|
|
this.submitJob(); |
|
|
|
} else { |
|
|
|
//如果是全检,必须全部扫描-------改为:任务中的是否允许部分提交:nxt 2023年12月13日 |
|
|
|
if (this.jobContent.allowPartialComplete == "TRUE") { |
|
|
|
this.submitJob(); |
|
|
|
} else { |
|
|
|
//不允许部分提交,提示 |
|
|
|
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + |
|
|
|
"]箱总共[" + this |
|
|
|
.subList.length + "]箱", res => { |
|
|
|
if (res) { |
|
|
|
this.openScanPopup(); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
submitJob() { |
|
|
|