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/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
index 4e33776..6a68ac0 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
@@ -68,31 +68,31 @@
   const formItems = reactive([
     // 鍩虹淇℃伅
     {
-      label: '鐗╂枡缂栧彿',
-      prop: 'materialNo',
+      label: '鐗╂枡鍨嬪彿',
+      prop: 'materialModel',
       el: 'input',
-      placeholder: '璇疯緭鍏ョ墿鏂欑紪鍙�',
+      placeholder: '璇疯緭鍏ョ墿鏂欏瀷鍙�',
       rules: [
-        { required: true, message: '鐗╂枡缂栧彿涓嶈兘涓虹┖', trigger: 'blur' },
+        { required: true, message: '鐗╂枡鍨嬪彿涓嶈兘涓虹┖', trigger: 'blur' },
         { max: 50, message: '闀垮害涓嶈兘瓒呰繃50涓瓧绗�', trigger: 'blur' },
       ],
     },
-    {
-      label: '鐗╂枡鍚嶇О',
-      prop: 'materialName',
-      el: 'input',
-      placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
-    },
+    // {
+    //   label: '鐗╂枡鍚嶇О',
+    //   prop: 'materialName',
+    //   el: 'input',
+    //   placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+    // },
     // 瀹瑰櫒淇℃伅
     {
       label: '瀹瑰櫒缂栧彿',
       prop: 'containerNo',
       el: 'input',
       placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
-      rules: [
-        { required: true, message: '鐗╂枡缂栧彿涓嶈兘涓虹┖', trigger: 'blur' },
-        { max: 50, message: '闀垮害涓嶈兘瓒呰繃50涓瓧绗�', trigger: 'blur' },
-      ],
+      // rules: [
+      //   { required: true, message: '鐗╂枡缂栧彿涓嶈兘涓虹┖', trigger: 'blur' },
+      //   { max: 50, message: '闀垮害涓嶈兘瓒呰繃50涓瓧绗�', trigger: 'blur' },
+      // ],
     },
     // 搴撳瓨淇℃伅
     {
@@ -210,7 +210,7 @@
   const onConfirm = async () => {
     await formRef.value?.validate()
     const data = {
-      materialNo: formData.value.materialNo,
+      materialModel: formData.value.materialModel,
       materialName: formData.value.materialName,
       containerNo: formData.value.containerNo,
       stockNumber: formData.value.stockNumber,
@@ -302,7 +302,7 @@
       )
       const res = data?.items[0]
       formData.value = {
-        materialNo: res.materialNo,
+        materialModel: res.materialModel,
         materialName: res.materialName,
         containerNo: res.containerNo,
         stockNumber: res.stockNumber,

--
Gitblit v1.9.3