From bfc11f87e2b64420c9917c0b9881b3e327d6f796 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 22:19:59 +0800
Subject: [PATCH] 优化调拨出入库

---
 新建文件夹/WMS/src/views/stock/stockInfo.vue |  105 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 79 insertions(+), 26 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
index f32f961..a63fd1c 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
@@ -44,10 +44,19 @@
       shelfLife: "",
       validityPeriod: "",
       remark: "",
+      warehouseCode: "",
     });
     
     const editFormOptions = ref([
       [
+        {
+          field: "warehouseCode",
+          title: "搴撴埧缂栧彿",
+          type: "string",
+          required: true,
+            data: [],
+           dataKey: "warehouseNuber",
+        },
         {
           field: "palletCode",
           title: "鎵樼洏缂栧彿",
@@ -67,15 +76,8 @@
           title: "搴撳瓨鐘舵��",
           type: "select",
           data: [],
-          bind: { key: "stockStatus", data: [] }
+          dataKey: "StockStatusEmun",
         },
-        {
-          field: "warehouseId",
-          title: "浠撳簱",
-          type: "select", 
-          data: [],
-          bind: { key: "warehouses", data: [] }
-        }
       ],
       [
         {
@@ -114,16 +116,24 @@
         },
         {
           field: "outboundQuantity",
-          title: "鍑哄簱鏁伴噺",
+          title: "寰呭嚭搴撴暟閲�",
           type: "number",
           span: 8
         },
+         {
+          title: "鍙敤搴撳瓨鏁�",
+          required: true,
+          field: "availableQuantity",
+          type: "number",
+        },
         {
           field: "supplyQuantity",
-          title: "鍙敤鏁伴噺",
+          title: "鐩樼偣宸紓鏁�",
           type: "number",
           span: 8
-        }
+
+        },
+        
       ],
       [
         {
@@ -170,6 +180,7 @@
       materielCode: "",
       materielName: "",
       batchNo: "",
+      warehouseCode:''
     });
     
     const searchFormOptions = ref([
@@ -184,12 +195,19 @@
           field: "locationCode",
           type: "string"
         },
-        { 
-          title: "浠撳簱", 
-          field: "warehouseId", 
+        // { 
+        //   title: "浠撳簱", 
+        //   field: "warehouseId", 
+        //   type: "select", 
+        //   data: [],
+        //   bind: { key: "warehouses", data: [] } 
+        // },
+          { 
+          title: "搴撴埧缂栧彿", 
+          field: "warehouseCode", 
           type: "select", 
           data: [],
-          bind: { key: "warehouses", data: [] } 
+          dataKey: "warehouseNuber",
         },
       ],
       [
@@ -226,6 +244,7 @@
         field: "palletCode",
         title: "鎵樼洏缂栧彿",
         type: "string",
+        hidden: true,
         width: 90,
         align: "left",
       },
@@ -242,16 +261,23 @@
         type: "select",
         width: 100,
         align: "left",
-        bind: { key: "stockStatus", data: [] },
+        bind: { key: "StockStatusEmun", data: [] },
       },
-      {
-        field: "warehouseId",
-        title: "浠撳簱",
-        type: "select",
-        width: 100,
-        align: "left",
-        bind: { key: "warehouses", data: [] },
-      },
+      // {
+      //   field: "warehouseId",
+      //   title: "浠撳簱",
+      //   type: "select",
+      //   width: 100,
+      //   align: "left",
+      //   bind: { key: "warehouses", data: [] },
+      // },
+            { 
+          title: "搴撴埧缂栧彿", 
+          field: "warehouseCode", 
+          type: "select", 
+          data: [],
+          bind: { key: "warehouseNuber", data: [] } 
+        },
       {
         field: "materielCode",
         title: "鐗╂枡缂栫爜",
@@ -289,17 +315,34 @@
       },
       {
         field: "outboundQuantity",
-        title: "鍑哄簱鏁伴噺",
+        title: "寰呭嚭搴撴暟閲�",
         type: "number",
         width: 100,
         align: "left",
       },
       {
+          title: "鍙敤搴撳瓨鏁�",
+          required: true,
+          field: "availableQuantity",
+          type: "number",
+        },
+      {
         field: "supplyQuantity",
-        title: "鍙敤鏁伴噺",
+        title: "鐩樼偣宸紓鏁�",
         type: "number",
         width: 100,
         align: "left",
+         cellStyle: (row) => {
+          const value = row.supplyQuantity;
+          if (value > 0) {
+            return { color: "#00ff00" }; // 缁胯壊
+          } else if (value < 0) {
+            return { color: "#ff0000" }; // 绾㈣壊
+          }
+          // else {
+          //   return { color: '#000000' }; // 榛戣壊
+          // }
+        },
       },
       {
         field: "inDate",
@@ -312,12 +355,14 @@
         field: "productionDate",
         title: "鐢熶骇鏃ユ湡",
         type: "date",
+        hidden: true,
         width: 120,
         align: "left",
       },
       {
         field: "shelfLife",
         title: "淇濊川鏈熷ぉ鏁�",
+        hidden: true,
         type: "number",
         width: 120,
         align: "left",
@@ -329,6 +374,14 @@
         width: 120,
         align: "left",
       },
+       {
+        field: "alarmInformation",
+        title: "鎶ヨ淇℃伅",
+        type: "string",
+        hidden: true,
+        width: 120,
+        align: "left",
+      },
       {
         field: "creater",
         title: "鍒涘缓浜�",

--
Gitblit v1.9.3