From 1839bc040282f8972a7b55f504d3e72f4269e48e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 14:34:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/financialManagement/receivable/salesReturn.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/financialManagement/receivable/salesReturn.vue b/src/views/financialManagement/receivable/salesReturn.vue
index 7077b97..4cf54d6 100644
--- a/src/views/financialManagement/receivable/salesReturn.vue
+++ b/src/views/financialManagement/receivable/salesReturn.vue
@@ -21,7 +21,6 @@
<div class="actions">
<div></div>
<div>
- <el-button type="primary" @click="add" icon="Plus">鏂板閫�璐�</el-button>
<el-button @click="handleOut" icon="Download">瀵煎嚭</el-button>
</div>
</div>
@@ -47,7 +46,7 @@
</PIMTable>
</div>
- <el-dialog :title="dialogTitle" v-model="dialogVisible" width="800px" append-to-body>
+ <FormDialog :title="dialogTitle" v-model="dialogVisible" width="800px" @confirm="submitForm" @cancel="dialogVisible = false">
<el-form :model="form" :rules="rules" ref="formRef" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
@@ -94,16 +93,17 @@
</el-form-item>
</el-form>
<template #footer>
- <el-button @click="dialogVisible = false">鍙栨秷</el-button>
<el-button type="primary" @click="submitForm">纭畾</el-button>
+ <el-button @click="dialogVisible = false">鍙栨秷</el-button>
</template>
- </el-dialog>
+ </FormDialog>
</div>
</template>
<script setup>
import { ref, reactive, onMounted } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
+import FormDialog from "@/components/Dialog/FormDialog.vue";
defineOptions({
name: "閿�鍞��璐�",
--
Gitblit v1.9.3