From f5052fa7d4e73c0df5a02a6ad8987f35df42b8f8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 07 十一月 2024 17:23:50 +0800
Subject: [PATCH] 1. 完成场景报告模块 2. 日报管理模块添加时间范围选择以及word报告生成
---
src/composables/formConfirm.js | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/composables/formConfirm.js b/src/composables/formConfirm.js
index dc295d5..e1eafd1 100644
--- a/src/composables/formConfirm.js
+++ b/src/composables/formConfirm.js
@@ -1,4 +1,4 @@
-import { defineProps, onActivated, onDeactivated, ref, watch } from 'vue';
+import { defineProps, onActivated, onDeactivated, reactive, ref, watch } from 'vue';
import { useCloned } from '@vueuse/core';
import { useMessageBoxTip, useMessageBox } from './messageBox';
@@ -13,7 +13,7 @@
},
reset = {
do: () => {}
- }
+ },
}) {
if (!submit.title) submit.title = '鎻愪氦';
if (!submit.msg) submit.msg = '纭鏄惁鎻愪氦锛�';
@@ -92,9 +92,10 @@
};
// 鎻愪氦琛ㄥ崟
- const onSubmit = function () {
- formRef.value.validate((valid) => {
+ const onSubmit = function (messageBox = true) {
+ formRef.value.validate(async (valid) => {
if (valid) {
+ if (messageBox) {
useMessageBoxTip({
confirmMsg: submit.msg,
confirmTitle: submit.title,
@@ -104,6 +105,10 @@
return res;
}
});
+ } else {
+ await submit.do();
+ submited();
+ }
}
});
};
--
Gitblit v1.9.3