From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/returnvendor/modules/detail-form.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/views/wls/returnvendor/modules/detail-form.vue b/src/views/wls/returnvendor/modules/detail-form.vue
index 9e07274..d0607c7 100644
--- a/src/views/wls/returnvendor/modules/detail-form.vue
+++ b/src/views/wls/returnvendor/modules/detail-form.vue
@@ -3,7 +3,7 @@
import { computed, ref } from 'vue';
-import { useVbenModal } from '../../../../packages/effects/common-ui/src';
+import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
@@ -21,6 +21,7 @@
const formData = ref<MesWmReturnVendorDetailApi.ReturnVendorDetail>();
const returnId = ref<number>(); // 鎵�灞為��璐у崟缂栧彿
const lineId = ref<number>(); // 鎵�灞為��璐у崟琛岀紪鍙�
+const batchId = ref<number>(); // 褰撳墠閫夋嫨搴撳瓨鐨勬壒娆＄紪鍙�
const getTitle = computed(() => {
return formData.value?.id
@@ -54,6 +55,7 @@
(await formApi.getValues()) as MesWmReturnVendorDetailApi.ReturnVendorDetail;
data.returnId = returnId.value;
data.lineId = lineId.value;
+ data.batchId = batchId.value;
try {
await (formData.value?.id
? updateReturnVendorDetail({ ...data, id: formData.value.id })
@@ -69,9 +71,14 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
+ batchId.value = undefined;
return;
}
- formApi.setState({ schema: useDetailFormSchema(formApi) });
+ formApi.setState({
+ schema: useDetailFormSchema(formApi, (stock) => {
+ batchId.value = stock?.batchId;
+ }),
+ });
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{
detailId?: number;
@@ -85,6 +92,7 @@
modalApi.lock();
try {
formData.value = await getReturnVendorDetail(data.detailId);
+ batchId.value = formData.value.batchId;
// 璁剧疆鍒� values
await formApi.setValues(formData.value);
} finally {
--
Gitblit v1.9.3