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 | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
index be02cb5..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
})
@@ -141,10 +142,11 @@
},
{
label: '鐗╂枡绫诲瀷',
- prop: 'materialType',
+ prop: 'materialTypeCode',
el: 'select',
clearable: true,
option: [],
+ storeValueAndLabel: true,
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑被鍨�',
highSelectAttrs: {
@@ -401,8 +403,11 @@
materialName_FilterMode: formData.value.materialName_FilterMode || '',
purchaseType: formData.value.purchaseType || '',
purchaseType_FilterMode: formData.value.purchaseType_FilterMode || '',
- materialType: formData.value.materialType || '',
+ 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 || '',
@@ -488,7 +493,7 @@
formData.value.materialNo = ''
formData.value.materialName = ''
formData.value.purchaseType = ''
- formData.value.materialType = ''
+ formData.value.materialTypeCode = ''
formData.value.primaryUnit = ''
formData.value.standard = ''
formData.value.outerDiameter = ''
@@ -525,18 +530,28 @@
}))
}
}
+ const updateFormTypeOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.materialTypeDesc,
+ value: item.materialTypeCode,
+ }))
+ }
+ }
/**
* 閫氱敤鏌ヨ鏋氫妇
*/
const commonQueryEnumForFrom = async () => {
- const purchaseTypeEnumEnum = await wmsMaterialDrawer.getWmsEnumData({
+ const materialTypeEnum = await wmsMaterialDrawer.getMaterialType()
+ updateFormTypeOptions('materialTypeCode', materialTypeEnum)
+
+ materialTypeList.value = materialTypeEnum
+
+ const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'PurchaseTypeEnum',
})
- updateFormItemOptions('purchaseType', purchaseTypeEnumEnum)
- const materialTypeEnumEnum = await wmsMaterialDrawer.getWmsEnumData({
- EnumName: 'MaterialTypeEnum',
- })
- updateFormItemOptions('materialType', materialTypeEnumEnum)
+ updateFormItemOptions('purchaseType', purchaseTypeEnum)
const yesNoEnumEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'YesNoEnum',
})
--
Gitblit v1.9.3