From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化

---
 WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue |  144 +++++++++++++++++++++++++++++------------------
 1 files changed, 88 insertions(+), 56 deletions(-)

diff --git a/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue b/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue
index c0490f8..ee1597d 100644
--- a/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue
+++ b/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue
@@ -27,7 +27,7 @@
       sortName: "id",
     });
     const editFormFields = ref({
-      areaId: "",
+      warehouseId: "",
       materielCode: "",
       materielName: "",
       materielDes: "",
@@ -37,10 +37,10 @@
     const editFormOptions = ref([
       [
         {
-          title: "鍖哄煙",
+          title: "鐗╂枡id",
           required: true,
-          field: "areaId",
-          type: "string",
+          field: "materielId",
+          type: "int",
         },
         {
           title: "鐗╂枡缂栧彿",
@@ -48,38 +48,63 @@
           field: "materielCode",
           type: "string",
         },
-        {
+      ],
+      [
+         {
           title: "鐗╂枡鍚嶇О",
           required: true,
           field: "materielName",
           type: "string",
         },
         {
-          title: "璁￠噺鍗曚綅",
+          title: "鐗╂枡瑙勬牸",
           required: true,
-          field: "unit",
+          field: "materielSpec",
           type: "string",
         },
       ],
       [
-        
-        {
-          title: "鐗╂枡鎻忚堪",
-          field: "materielDes",
-          type: "textarea",
+       {
+          title: "鐗╂枡鍩烘湰鍒嗙被",
+          required: true,
+          field: "materielType",
+          type: "string",
+
+          
         },
+        {
+        field: "materielSourceType",
+        title: "鐗╂枡灞炴�у垎绫�",
+        required: true,
+        type: "string",
+      },  
       ],
+      [
+        {
+          title: "鍩烘湰鍗曚綅",
+          required: true,
+          field: "materielUnit",
+          type: "string",
+        },
+        {
+          title: "鐗╂枡鐘舵��",
+          required: true,
+          field: "materielState",
+          type: "select",
+          data:[{key:'Enable',value:'鍚敤'},{key:'Disable',value:'绂佺敤'}]
+        },
+        
+      ],
+      
     ]);
     const searchFormFields = ref({
       materielCode: "",
       materielName: "",
-      areaId: "",
     });
     const searchFormOptions = ref([
       [
         { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
         { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
-        { title: "璁惧鐘舵��", field: "deviceStatus" },
       ],
     ]);
     const columns = ref([
@@ -94,12 +119,12 @@
         align: "left",
       },
       {
-        field: "areaId",
-        title: "鍖哄煙涓婚敭",
-        type: "string",
-        width: 90,
-        align: "left",
-      },
+          title: "鐗╂枡id",
+          field: "materielId",
+          type: "int",
+          width:80,
+          align:"left"
+        },
       {
         field: "materielCode",
         title: "鐗╂枡缂栧彿",
@@ -115,54 +140,65 @@
         align: "left",
       },
       {
-        field: "materielDes",
-        title: "鐗╂枡鎻忚堪",
-        type: "decimal",
-        width: 90,
-        align: "left",
-      },
-      {
-        field: "cotainerType",
-        title: "瀹瑰櫒绫诲瀷",
+        field: "materielSpec",
+        title: "鐗╂枡瑙勬牸",
         type: "string",
-        width: 90,
+        width: 240,
         align: "left",
       },
       {
-        field: "packspes",
-        title: "鍖呰瑙勬牸",
-        type: "int",
+        field: "materielSourceType",
+        title: "鐗╂枡灞炴�у垎绫�",
+        type: "string",
+        width: 120,
+        align: "left",
+        bind: { key: "materielSourceTypeEnum", data: [] },
+      },
+      {
+        field: "materielType",
+        title: "鐗╂枡鍩烘湰鍒嗙被",
+        type: "string",
+        width: 120,
+        align: "left",
+    
+      },
+      {
+        field: "materielUnit",
+        title: "鍩烘湰鍗曚綅",
+        type: "string",
         width: 120,
         align: "left",
       },
       {
-        field: "attribute",
-        title: "鐗╂枡灞炴��",
-        type: "string",
-        width: 200,
-        align: "left",
-      },
-      {
-        field: "unit",
-        title: "璁￠噺鍗曚綅",
-        type: "string",
+        field: "materielSize",
+        title: "鐗╂枡灏哄",
+        type: "float",
         width: 180,
         align: "left",
       },
       {
-        field: "validity",
-        title: "鏈夋晥鏈�",
-        type: "string",
+        field: "materielLength",
+        title: "鐗╂枡闀垮害",
+        type: "float",
         width: 120,
         align: "left",
       },
       {
-        field: "safetyStock",
-        title: "瀹夊叏搴撳瓨",
-        type: "string",
+        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: "creater",
         title: "鍒涘缓浜�",
@@ -183,6 +219,7 @@
         type: "string",
         width: 100,
         align: "left",
+        hidden:true
       },
       {
         field: "modifyDate",
@@ -190,14 +227,9 @@
         type: "datetime",
         width: 160,
         align: "left",
+        hidden:true
       },
-      {
-        field: "remark",
-        title: "澶囨敞",
-        type: "string",
-        width: 100,
-        align: "left",
-      },
+      
     ]);
     const detail = ref({
       cnName: "#detailCnName",

--
Gitblit v1.9.3