From 67348f250a1b7970059698002949a5e0a5f3c52f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 14 八月 2025 08:51:04 +0800
Subject: [PATCH] 上传最新代码

---
 项目代码/WMS/WMSClient/src/views/basic/materielInfo.vue |  168 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 87 insertions(+), 81 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 97ab61e..f92d209 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"
@@ -30,9 +30,16 @@
       warehouseId: "",
       materielCode: "",
       materielName: "",
-      materielDes: "",
-      isMixBatch: "",
-      isMixMateriel: "",
+      materielSourceType: "",
+      materielSpec: "",
+      materielUnit: "",
+      materielLength: "",
+      materielThickness: "",
+      materielWide: "",
+      materielState: "",
+      isCheck: "",
+      materielInvOrgId: ""
+
     });
     const editFormOptions = ref([
       [
@@ -50,13 +57,21 @@
           field: "materielCode",
           type: "string",
         },
-      ],
-      [
-         {
+        {
           title: "鐗╂枡鍚嶇О",
           required: true,
           field: "materielName",
           type: "string",
+        }
+      ],
+      [
+        {
+          title: "鐗╂枡鍒嗙被",
+          field: "materielSourceType",
+          type: "select",
+          dataKey: "materielTypeEnum",
+          data: [],
+          required: true,
         },
         {
           title: "鐗╂枡瑙勬牸",
@@ -64,32 +79,38 @@
           field: "materielSpec",
           type: "string",
         },
-      ],
-      [
-       {
-          title: "鐗╂枡鍩烘湰鍒嗙被",
-          required: true,
-          field: "materielType",
-          type: "select",
-          dataKey:"materielTypeEnum",
-          data:[]
-          
-        },
-        {
-        field: "materielSourceType",
-        title: "鐗╂枡灞炴�у垎绫�",
-        required: true,
-        type: "select",
-        dataKey:"materielSourceTypeEnum",
-        data:[]
-      },  
-      ],
-      [
         {
           title: "鍩烘湰鍗曚綅",
           required: true,
           field: "materielUnit",
           type: "string",
+        },
+      ],
+      [
+        {
+          title: "鐗╂枡闀垮害",
+          field: "materielLength",
+          type: "float",
+        },
+        {
+          title: "鐗╂枡楂樺害",
+          field: "materielThickness",
+          type: "float",
+        },
+        {
+          title: "鐗╂枡瀹藉害",
+          field: "materielWide",
+          type: "float",
+        },
+      ],
+      [
+        {
+          title: "搴撳瓨缁勭粐",
+          required: true,
+          field: "materielInvOrgId",
+          type: "select",
+          dataKey:"materielInvOrgEnum",
+          data:[]
         },
         {
           title: "鐗╂枡鐘舵��",
@@ -98,15 +119,6 @@
           type: "select",
           dataKey:"enableEnum",
           data:[]
-        },
-        
-      ],
-      [
-        {
-          title: "搴撳瓨缁勭粐",
-          required: true,
-          field: "materielInvOrgId",
-          type: "string",
         },
         {
           title: "鏄惁闇�瑕佽川妫�",
@@ -127,6 +139,7 @@
       [
         { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
         { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
+        {title: "搴撳瓨缁勭粐", field:"materielInvOrgId",type:"select",dataKey:"materielInvOrgEnum",data:[]},
         {title: "鎵�灞炰粨搴�", field:"warehouseId",type:"select",dataKey:"warehouses",data:[]}
       ],
     ]);
@@ -150,6 +163,14 @@
         bind: { key: "warehouses", data: [] },
       },
       {
+        field: "materielInvOrgId",
+        title: "搴撳瓨缁勭粐",
+        type: "string",
+        width: 100,
+        align: "left",
+        bind: { key: "materielInvOrgEnum", data: [] },
+      },
+      {
         field: "materielCode",
         title: "鐗╂枡缂栧彿",
         type: "string",
@@ -164,27 +185,40 @@
         align: "left",
       },
       {
+        field: "materielSourceType",
+        title: "鐗╂枡鍒嗙被",
+        type: "string",
+        width: 100,
+        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: "鐗╂枡瑙勬牸",
         type: "string",
-        width: 240,
+        width: 180,
         align: "left",
-      },
-      {
-        field: "materielSourceType",
-        title: "鐗╂枡灞炴�у垎绫�",
-        type: "string",
-        width: 120,
-        align: "left",
-        bind: { key: "materielSourceTypeEnum", data: [] },
-      },
-      {
-        field: "materielType",
-        title: "鐗╂枡鍩烘湰鍒嗙被",
-        type: "string",
-        width: 120,
-        align: "left",
-    
       },
       {
         field: "materielUnit",
@@ -194,39 +228,11 @@
         align: "left",
       },
       {
-        field: "materielSize",
-        title: "鐗╂枡灏哄",
-        type: "float",
-        width: 180,
-        align: "left",
-      },
-      {
-        field: "materielLength",
-        title: "鐗╂枡闀垮害",
-        type: "float",
-        width: 120,
-        align: "left",
-      },
-      {
-        field: "materielThickness",
-        title: "鐗╂枡鍘氬害",
-        type: "float",
-        width: 120,
-        align: "left",
-      },
-      {
         field: "materielState",
         title: "鐗╂枡鐘舵��",
         type: "select",
         width: 100,
         bind:{key:"",data: [{key:'Enable',value:'鍚敤'},{key:'Disable',value:'绂佺敤'}] },
-        align: "left",
-      },
-      {
-        field: "materielInvOrgId",
-        title: "搴撳瓨缁勭粐",
-        type: "string",
-        width: 100,
         align: "left",
       },
       {

--
Gitblit v1.9.3