|
@@ -256,11 +256,10 @@ const saveReportsClick = async () => {
|
|
|
const isForm = await formValidate(reportsFormRef.value)
|
|
|
if (!isForm) return false
|
|
|
reportsLoding.value = true
|
|
|
- const { error, val, msg } = await mainApi.buildReport(reportsForm.value)
|
|
|
-
|
|
|
+ const { error, val } = await mainApi.buildReport(reportsForm.value)
|
|
|
+ if (error) {
|
|
|
reportsLoding.value = false
|
|
|
window.$message?.error('数据异常')
|
|
|
-
|
|
|
return
|
|
|
}
|
|
|
await newDownBlob(val)
|
|
@@ -296,13 +295,20 @@ const downloadTemplateLoading = ref(false)
|
|
|
const downloadTemplate = async () => {
|
|
|
await useClick() //这里要使用 await 来等待
|
|
|
downloadTemplateLoading.value = true
|
|
|
- const { error, data, msg } = await mainApi.exportTemplate()
|
|
|
- downloadTemplateLoading.value = false
|
|
|
- if (error && isNullES(data)) {
|
|
|
- window.$message?.error(msg ?? '数据异常')
|
|
|
+ // const { error, data, msg } = await mainApi.exportTemplate()
|
|
|
+ // downloadTemplateLoading.value = false
|
|
|
+ // if (error && isNullES(data)) {
|
|
|
+ // window.$message?.error(msg ?? '数据异常')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // await window.electron.ipcRenderer.invoke('download-file', data)
|
|
|
+ const { error, val } = await mainApi.exportTemplate()
|
|
|
+ if (error) {
|
|
|
+ downloadTemplateLoading.value = false
|
|
|
+ window.$message?.error('数据异常')
|
|
|
return
|
|
|
}
|
|
|
- await window.electron.ipcRenderer.invoke('download-file', data)
|
|
|
+ await newDownBlob(val)
|
|
|
downloadTemplateLoading.value = false
|
|
|
}
|
|
|
|