From 504eb4e5d48557eac2bcf233452e44964f0e0640 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:06:51 +0800
Subject: [PATCH] 冲突
---
HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx b/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
index 2e2946f..7e1295f 100644
--- a/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
+++ b/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
@@ -86,6 +86,12 @@
rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷', trigger: 'change' }],
},
{
+ label: '鍨嬪彿',
+ prop: 'materialModel',
+ el: 'input',
+ placeholder: '璇疯緭鍏ュ瀷鍙�',
+ },
+ {
label: '涓诲崟浣�',
prop: 'primaryUnit',
el: 'input',
@@ -214,6 +220,7 @@
materialType: formData.value.materialType,
primaryUnit: formData.value.primaryUnit,
standard: formData.value.standard,
+ materialModel: formData.value.materialModel,
outerDiameter: formData.value.outerDiameter,
wallThickness: formData.value.wallThickness,
materialQuality: formData.value.materialQuality,
@@ -278,6 +285,7 @@
materialType: res.materialType,
primaryUnit: res.primaryUnit,
standard: res.standard,
+ materialModel: res.materialModel,
outerDiameter: res.outerDiameter,
wallThickness: res.wallThickness,
materialQuality: res.materialQuality,
--
Gitblit v1.9.3