diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index cb14f2b..491377c 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -234,13 +234,19 @@ UploadFile(fd).then((res) => { if (res.code === 200) { form.value.certificateReportFile = res.data[0] - // 重置当前验证 - // ElMessage.success('文件上传成功') - loading.close() - ElMessageBox.alert('文件上传成功!请点击保存按钮!', '提示', { - confirmButtonText: '确定', - }) + ElMessageBox.confirm( + '文件上传成功,是否保存上传的文件?', + '提示', + { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning', + }, + ) + .then(() => { + handleSave('saveUploadFile') + }) } else { ElMessage.error(res.message) @@ -495,7 +501,7 @@ } // 保存 -const handleSave = () => { +function handleSave(type = '') { if (!sampleList.value.length) { ElMessage.warning('被检样品不能为空') return false @@ -528,7 +534,9 @@ failUpdateMeasureData(params).then((res) => { ElMessage.success('保存成功') loading.close() - close() + if (type !== 'saveUploadFile') { + close() + } }).catch(() => { loading.close() }) @@ -537,7 +545,9 @@ draftUpdateMeasureData(params).then((res) => { ElMessage.success('保存成功') loading.close() - close() + if (type !== 'saveUploadFile') { + close() + } }).catch(() => { loading.close() })