From 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 00:41:18 +0800
Subject: [PATCH] 优化出入库逻辑

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue |  110 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 45 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
index c0490f8..0e18099 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
@@ -36,12 +36,12 @@
     });
     const editFormOptions = ref([
       [
-        {
-          title: "鍖哄煙",
-          required: true,
-          field: "areaId",
-          type: "string",
-        },
+        // {
+        //   title: "鍖哄煙",
+        //   required: true,
+        //   field: "areaId",
+        //   type: "string",
+        // },
         {
           title: "鐗╂枡缂栧彿",
           required: true,
@@ -54,15 +54,14 @@
           field: "materielName",
           type: "string",
         },
-        {
-          title: "璁¢噺鍗曚綅",
-          required: true,
-          field: "unit",
-          type: "string",
-        },
+        // {
+        //   title: "璁¢噺鍗曚綅",
+        //   required: true,
+        //   field: "unit",
+        //   type: "string",
+        // },
       ],
       [
-        
         {
           title: "鐗╂枡鎻忚堪",
           field: "materielDes",
@@ -97,6 +96,7 @@
         field: "areaId",
         title: "鍖哄煙涓婚敭",
         type: "string",
+        hidden: true,
         width: 90,
         align: "left",
       },
@@ -115,17 +115,58 @@
         align: "left",
       },
       {
-        field: "materielDes",
-        title: "鐗╂枡鎻忚堪",
-        type: "decimal",
-        width: 90,
-        align: "left",
-      },
-      {
         field: "cotainerType",
         title: "瀹瑰櫒绫诲瀷",
         type: "string",
         width: 90,
+        align: "left",
+        hidden: true,
+      },
+      {
+        field: "isMixBatch",
+        title: "鏄惁鍏佽娣锋壒",
+        type: "string",
+        width: 120,
+        align: "left",
+        bind: { key: "yesno", data: [] },
+      },
+      {
+        field: "isMixMateriel",
+        title: "鏄惁鍏佽娣锋枡",
+        type: "string",
+        width: 120,
+        align: "left",
+        bind: { key: "yesno", data: [] },
+      },
+      {
+        field: "attribute",
+        title: "鐗╂枡灞炴��",
+        type: "string",
+        width: 200,
+        hidden: true,
+        align: "left",
+      },
+      // {
+      //   field: "unit",
+      //   title: "璁¢噺鍗曚綅",
+      //   type: "string",
+      //   width: 180,
+      //   align: "left",
+      // },
+      {
+        field: "validity",
+        title: "鏈夋晥鏈�",
+        type: "string",
+        hidden: true,
+        width: 120,
+        align: "left",
+      },
+      {
+        field: "safetyStock",
+        title: "瀹夊叏搴撳瓨",
+        hidden: true,
+        type: "string",
+        width: 120,
         align: "left",
       },
       {
@@ -136,31 +177,10 @@
         align: "left",
       },
       {
-        field: "attribute",
-        title: "鐗╂枡灞炴��",
-        type: "string",
-        width: 200,
-        align: "left",
-      },
-      {
-        field: "unit",
-        title: "璁¢噺鍗曚綅",
-        type: "string",
-        width: 180,
-        align: "left",
-      },
-      {
-        field: "validity",
-        title: "鏈夋晥鏈�",
-        type: "string",
-        width: 120,
-        align: "left",
-      },
-      {
-        field: "safetyStock",
-        title: "瀹夊叏搴撳瓨",
-        type: "string",
-        width: 120,
+        field: "materielDes",
+        title: "鐗╂枡鎻忚堪",
+        type: "decimal",
+        width: 90,
         align: "left",
       },
       {

--
Gitblit v1.9.3