From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/returnissue/modules/line-form.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/wls/returnissue/modules/line-form.vue b/src/views/wls/returnissue/modules/line-form.vue
index 7cdc601..4e14a8d 100644
--- a/src/views/wls/returnissue/modules/line-form.vue
+++ b/src/views/wls/returnissue/modules/line-form.vue
@@ -19,7 +19,8 @@
const emit = defineEmits(['success']);
const formData = ref<MesWmReturnIssueLineApi.ReturnIssueLine>();
-const issueId = ref<number>(); // 鎵�灞為��鏂欏崟缂栧彿
+const issueId = ref<number>();
+const workOrderId = ref<number>();
const getTitle = computed(() => {
return formData.value?.id
@@ -69,18 +70,22 @@
formData.value = undefined;
return;
}
- formApi.setState({ schema: useLineFormSchema(formApi) });
- // 鍔犺浇鏁版嵁
- const data = modalApi.getData<{ id?: number; issueId: number }>();
+ const data = modalApi.getData<{ id?: number; issueId: number; workOrderId?: number }>();
issueId.value = data.issueId;
+ workOrderId.value = data.workOrderId;
+ formApi.setState({ schema: useLineFormSchema(formApi, workOrderId.value) });
if (!data.id) {
return;
}
modalApi.lock();
try {
formData.value = await getReturnIssueLine(data.id);
- // 璁剧疆鍒� values
- await formApi.setValues(formData.value);
+ await formApi.setValues({
+ ...formData.value,
+ materialDisplayName: [formData.value.itemName, formData.value.specification]
+ .filter(Boolean)
+ .join(' | '),
+ });
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3