diff --git a/resources/assets/js/pages/manage/components/Report.vue b/resources/assets/js/pages/manage/components/Report.vue index 2767cbd27..5641f5088 100644 --- a/resources/assets/js/pages/manage/components/Report.vue +++ b/resources/assets/js/pages/manage/components/Report.vue @@ -63,7 +63,10 @@ export default { this.reportTabs = this.reportType; // if (this.$isMainElectron) { - this.$Electron.registerMsgListener('reportSaveSuccess', this.saveSuccess) + this.$Electron.registerMsgListener('reportSaveSuccess', ({data, msg}) => { + $A.messageSuccess(msg) + this.saveSuccess(data) + }) } }, diff --git a/resources/assets/js/pages/manage/components/ReportEdit.vue b/resources/assets/js/pages/manage/components/ReportEdit.vue index c7ab72311..b01935ec0 100644 --- a/resources/assets/js/pages/manage/components/ReportEdit.vue +++ b/resources/assets/js/pages/manage/components/ReportEdit.vue @@ -132,8 +132,8 @@ export default { this.reportData.receive = []; this.getTemplate(); // msg 结果描述 - $A.messageSuccess(msg); - this.$emit("saveSuccess", data); + !this.$isSubElectron && $A.messageSuccess(msg); + this.$emit("saveSuccess", {data, msg}); }).catch(({msg}) => { isModal && this.$Modal.remove(); // msg 错误原因 diff --git a/resources/assets/js/pages/single/reportEdit.vue b/resources/assets/js/pages/single/reportEdit.vue index 5fd7e7d9b..46b949dd3 100644 --- a/resources/assets/js/pages/single/reportEdit.vue +++ b/resources/assets/js/pages/single/reportEdit.vue @@ -42,6 +42,7 @@ export default { channel: 'reportSaveSuccess', data, }); + window.close(); } } }