From 8fbcbc9c365e911b561d17834f8e350974ca1439 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 12:43:13 +0800
Subject: [PATCH] 22
---
HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
index 1c0af31..b44960a 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
@@ -25,6 +25,8 @@
// ref
const formRef = ref()
+ const materialTypeList = ref([])
+
const disabled = ref(false)
const current = computed(() => {
@@ -79,10 +81,11 @@
},
{
label: '鐗╂枡绫诲瀷',
- prop: 'materialType',
+ prop: 'materialTypeCode',
el: 'select',
placeholder: '璇烽�夋嫨鐗╂枡绫诲瀷',
options: [],
+ // valueAndLabel: true,
rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷', trigger: 'change' }],
},
{
@@ -213,11 +216,15 @@
*/
const onConfirm = async () => {
await formRef.value?.validate()
+ console.log(formData.value.materialTypeCode)
const data = {
materialNo: formData.value.materialNo,
materialName: formData.value.materialName,
purchaseType: formData.value.purchaseType,
- materialType: formData.value.materialType,
+ materialTypeCode: formData.value.materialTypeCode,
+ materialTypeDesc: materialTypeList.value.find(
+ (item) => item.materialTypeCode === formData.value.materialTypeCode
+ )?.materialTypeDesc,
primaryUnit: formData.value.primaryUnit,
standard: formData.value.standard,
materialModel: formData.value.materialModel,
@@ -256,14 +263,22 @@
}))
}
}
+ 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 onOpen = async () => {
- const materialTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
- EnumName: 'MaterialTypeEnum',
- })
- updateFormItemOptions('materialType', materialTypeEnum)
+ const materialTypeEnum = await wmsMaterialDrawer.getMaterialType()
+ updateFormTypeOptions('materialTypeCode', materialTypeEnum)
+ materialTypeList.value = materialTypeEnum
const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'PurchaseTypeEnum',
@@ -282,7 +297,7 @@
materialNo: res.materialNo,
materialName: res.materialName,
purchaseType: res.purchaseType,
- materialType: res.materialType,
+ materialTypeCode: res.materialTypeCode,
primaryUnit: res.primaryUnit,
standard: res.standard,
materialModel: res.materialModel,
--
Gitblit v1.9.3