From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/returnissue/modules/detail-form.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/views/wls/returnissue/modules/detail-form.vue b/src/views/wls/returnissue/modules/detail-form.vue
index 7539d65..4b3c638 100644
--- a/src/views/wls/returnissue/modules/detail-form.vue
+++ b/src/views/wls/returnissue/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';
@@ -85,8 +85,13 @@
modalApi.lock();
try {
formData.value = await getReturnIssueDetail(data.detailId);
- // 璁剧疆鍒� values
- await formApi.setValues(formData.value);
+ // 璁剧疆鍒� values锛屽苟鏋勫缓鐗╂枡灞曠ず鍚�
+ await formApi.setValues({
+ ...formData.value,
+ materialDisplayName: [formData.value.itemName, formData.value.specification]
+ .filter(Boolean)
+ .join(' | '),
+ });
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3