From a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 03 十一月 2025 08:23:05 +0800
Subject: [PATCH] ERP接口代码更新,WCS代码优化,出入库分配优化

---
 项目代码/WMS/WMSClient/src/views/basic/materielInfo.vue |  118 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 69 insertions(+), 49 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue"
index f92d209..6db835d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue"
@@ -38,7 +38,8 @@
       materielWide: "",
       materielState: "",
       isCheck: "",
-      materielInvOrgId: ""
+      materielInvOrgId: "",
+      materierlWeight: "",
 
     });
     const editFormOptions = ref([
@@ -62,9 +63,7 @@
           required: true,
           field: "materielName",
           type: "string",
-        }
-      ],
-      [
+        },
         {
           title: "鐗╂枡鍒嗙被",
           field: "materielSourceType",
@@ -73,6 +72,9 @@
           data: [],
           required: true,
         },
+      ],
+      [
+        
         {
           title: "鐗╂枡瑙勬牸",
           required: true,
@@ -83,27 +85,10 @@
           title: "鍩烘湰鍗曚綅",
           required: true,
           field: "materielUnit",
-          type: "string",
+          type: "select",
+          dataKey:"materielUnitEnum",
+          data:[]
         },
-      ],
-      [
-        {
-          title: "鐗╂枡闀垮害",
-          field: "materielLength",
-          type: "float",
-        },
-        {
-          title: "鐗╂枡楂樺害",
-          field: "materielThickness",
-          type: "float",
-        },
-        {
-          title: "鐗╂枡瀹藉害",
-          field: "materielWide",
-          type: "float",
-        },
-      ],
-      [
         {
           title: "搴撳瓨缁勭粐",
           required: true,
@@ -120,16 +105,39 @@
           dataKey:"enableEnum",
           data:[]
         },
+      ],
+      [
         {
-          title: "鏄惁闇�瑕佽川妫�",
+          title: "鐗╂枡閲嶉噺",
+          field: "materielWeight",
+          type: "float",
+        },
+        {
+          title: "鐗╂枡闀垮害",
+          field: "materielLength",
+          type: "float",
+        },
+        {
+          title: "鐗╂枡鍘氬害",
+          field: "materielThickness",
+          type: "float",
+        },
+        {
+          title: "鐗╂枡瀹藉害",
+          field: "materielWide",
+          type: "float",
+        },
+      ],
+      [
+        {
+          title: "鏄惁璐ㄦ",
           required: true,
           field: "isCheck",
           type: "select",
-          dataKey:"yesno",
+          dataKey:"enableEnum",
           data:[]
         },
       ]
-      
     ]);
     const searchFormFields = ref({
       materielCode: "",
@@ -141,6 +149,9 @@
         { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
         {title: "搴撳瓨缁勭粐", field:"materielInvOrgId",type:"select",dataKey:"materielInvOrgEnum",data:[]},
         {title: "鎵�灞炰粨搴�", field:"warehouseId",type:"select",dataKey:"warehouses",data:[]}
+      ],
+      [
+        {title: "鐗╂枡鍒嗙被", field:"materielSourceType",type:"select",dataKey:"materielTypeEnum",data:[]},
       ],
     ]);
     const columns = ref([
@@ -192,27 +203,7 @@
         align: "left",
         bind: { key: "materielTypeEnum", data: [] },
       },
-      {
-        field: "materielLength",
-        title: "鐗╂枡闀垮害",
-        type: "float",
-        width: 180,
-        align: "left",
-      },
-      {
-        field: "materielThickness",
-        title: "鐗╂枡楂樺害",
-        type: "float",
-        width: 180,
-        align: "left",
-      },
-      {
-        field: "materielWide",
-        title: "鐗╂枡瀹藉害",
-        type: "float",
-        width: 180,
-        align: "left",
-      },
+      
       {
         field: "materielSpec",
         title: "鐗╂枡瑙勬牸",
@@ -226,6 +217,7 @@
         type: "string",
         width: 120,
         align: "left",
+        bind: { key: "materielUnitEnum", data: [] },
       },
       {
         field: "materielState",
@@ -237,13 +229,41 @@
       },
       {
         field: "isCheck",
-        title: "鏄惁闇�瑕佽川妫�",
+        title: "鏄惁璐ㄦ",
         type: "int",
         bind:{key:"",data: [{key:'False',value:'鍚�'},{key:'True',value:'鏄�'}] },
         width: 100,
         align: "left",
       },
       {
+        field: "materielWeight",
+        title: "鐗╂枡閲嶉噺",
+        type: "float",
+        width: 180,
+        align: "left",
+      },
+      {
+        field: "materielLength",
+        title: "鐗╂枡闀垮害",
+        type: "float",
+        width: 180,
+        align: "left",
+      },
+      {
+        field: "materielThickness",
+        title: "鐗╂枡鍘氬害",
+        type: "float",
+        width: 180,
+        align: "left",
+      },
+      {
+        field: "materielWide",
+        title: "鐗╂枡瀹藉害",
+        type: "float",
+        width: 180,
+        align: "left",
+      },
+      {
         field: "creater",
         title: "鍒涘缓浜�",
         type: "string",

--
Gitblit v1.9.3