From f139849fb65e7264d173bc46f45d70409e559504 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 08 八月 2025 15:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ai' into dev_ai
---
src/views/equipmentManagement/ledger/Modal.vue | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/src/views/equipmentManagement/ledger/Modal.vue b/src/views/equipmentManagement/ledger/Modal.vue
index d1562dd..0cea56c 100644
--- a/src/views/equipmentManagement/ledger/Modal.vue
+++ b/src/views/equipmentManagement/ledger/Modal.vue
@@ -1,11 +1,11 @@
<template>
- <el-dialog :title="modalOptions.title" v-model="visible">
+ <el-dialog :title="modalOptions.title" v-model="visible" @close="close">
<Form ref="formRef"></Form>
<template #footer>
+ <el-button type="primary" @click="sendForm" :loading="loading">
+ {{ modalOptions.confirmText }}
+ </el-button>
<el-button @click="closeModal">{{ modalOptions.cancelText }}</el-button>
- <el-button type="primary" @click="sendForm" :loading="loading">
- {{ modalOptions.confirmText }}
- </el-button>
</template>
</el-dialog>
</template>
@@ -15,6 +15,7 @@
import { addLedger, editLedger } from "@/api/equipmentManagement/ledger";
import Form from "./Form.vue";
import { ElMessage } from "element-plus";
+const { proxy } = getCurrentInstance()
defineOptions({
name: "璁惧鍙拌处鏂板缂栬緫",
@@ -31,20 +32,28 @@
modalOptions,
handleConfirm,
closeModal,
-} = useModal();
+} = useModal({ title: "璁惧鍙拌处" });
-const sendForm = async () => {
- loading.value = true;
- const { code } = id.value
- ? await editLedger({ id: id.value, ...formRef.value.form })
- : await addLedger(formRef.value.form);
- if (code == 200) {
- emits("success");
- ElMessage({ message: "鎿嶄綔鎴愬姛", type: "success" });
- closeModal();
- } else {
- loading.value = false;
- }
+const sendForm = () => {
+ proxy.$refs.formRef.$refs.formRef.validate(async valid => {
+ if (valid) {
+ const {code} = id.value
+ ? await editLedger({id: id.value, ...formRef.value.form})
+ : await addLedger(formRef.value.form);
+ if (code == 200) {
+ emits("success");
+ ElMessage({message: "鎿嶄綔鎴愬姛", type: "success"});
+ close();
+ } else {
+ loading.value = false;
+ }
+ }
+ })
+};
+
+const close = () => {
+ formRef.value.resetFormAndValidate();
+ closeModal();
};
const loadForm = async (id) => {
--
Gitblit v1.9.3