From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 04 6月 2025 17:42:13 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx index d99653e..15d52c0 100644 --- a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx +++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx @@ -34,6 +34,7 @@ const disabled = ref(false) + const materialTypeList = ref([]) const current = computed(() => { return props.row || null }) @@ -404,6 +405,9 @@ purchaseType_FilterMode: formData.value.purchaseType_FilterMode || '', materialTypeCode: formData.value.materialTypeCode || '', materialType_FilterMode: formData.value.materialType_FilterMode || '', + materialTypeDesc: materialTypeList.value.find( + (item) => item.materialTypeCode === formData.value.materialTypeCode + )?.materialTypeDesc, primaryUnit: formData.value.primaryUnit || '', primaryUnit_FilterMode: formData.value.primaryUnit_FilterMode || '', standard: formData.value.standard || '', @@ -542,6 +546,8 @@ const materialTypeEnum = await wmsMaterialDrawer.getMaterialType() updateFormTypeOptions('materialTypeCode', materialTypeEnum) + materialTypeList.value = materialTypeEnum + const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({ EnumName: 'PurchaseTypeEnum', }) -- Gitblit v1.9.3