From 2f8fc989f339a936b01092caebd4c46e6109da1b Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 16 十二月 2025 11:29:37 +0800
Subject: [PATCH] 代码提交

---
 WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue |  135 ++++++++++++++++++--------------------------
 1 files changed, 55 insertions(+), 80 deletions(-)

diff --git a/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue b/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue
index b35fb25..9cec1aa 100644
--- a/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue
+++ b/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue
@@ -31,27 +31,43 @@
       locationCode: "",
       locationName: "",
     });
-    const editFormOptions = ref([
-      
-    ]);
+    const editFormOptions = ref([]);
     const searchFormFields = ref({
       palletCode: "",
       // locationCode: "",
-      materielCode:"",
-      batchNo:""
+      materielCode: "",
+      batchNo: "",
     });
     const searchFormOptions = ref([
       [
-        { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
-        { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
-        { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
-        { title: "搴撳瓨鐘舵��", field: "stockStatus",type: "select",dataKey: "stockStatusEmun",data: [],},
+        { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
+        { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+        {
+          title: "璐т綅鐘舵��",
+          field: "locationStatus",
+          type: "selectList",
+          dataKey: "locationStatusEnum",
+          data: [],
+        },
+        {
+          title: "搴撳瓨鐘舵��",
+          field: "stockStatus",
+          type: "select",
+          dataKey: "stockStatusEmun",
+          data: [],
+        },
       ],
       [
-        { title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
-        { title: "鎵规鍙�", field: "batchNo",type: "like"},
-        { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: [],},
-        { title: "搴撳瓨鍒涘缓鏃堕棿",field: "createDate",type: "datetime"},
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+        { title: "鎵规鍙�", field: "batchNo", type: "like" },
+        {
+          title: "鎵�灞炰粨搴�",
+          field: "warehouseId",
+          type: "select",
+          dataKey: "warehouses",
+          data: [],
+        },
+        { title: "搴撳瓨鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
       ],
     ]);
     const columns = ref([
@@ -101,7 +117,7 @@
         type: "decimal",
         width: 100,
         align: "left",
-        hidden:true
+        hidden: true,
       },
       {
         field: "materielCode",
@@ -115,7 +131,7 @@
         title: "鎵�鍚墿鏂欐壒娆�",
         type: "string",
         width: 200,
-        align: "left"
+        align: "left",
       },
       {
         field: "sumStock",
@@ -171,7 +187,7 @@
         type: "string",
         width: 100,
         align: "left",
-        bind:{key: "locationTypeEnum", data: []}
+        bind: { key: "locationTypeEnum", data: [] },
       },
       {
         field: "locationStatus",
@@ -223,7 +239,7 @@
         type: "string",
         width: 100,
         align: "left",
-        hidden:true
+        hidden: true,
       },
     ]);
     const detail = ref({
@@ -241,89 +257,48 @@
           align: "left",
         },
         {
-          field: "stockId",
-          title: "搴撳瓨淇℃伅涓婚敭",
-          type: "string",
-          width: 90,
-          align: "left",
-          hidden: true
-        },
-        {
           field: "materielCode",
           title: "鐗╂枡缂栧彿",
           type: "string",
-          width: 110,
+          width: 150,
           align: "left",
+          // sort:true,
         },
         {
           field: "materielName",
           title: "鐗╂枡鍚嶇О",
           type: "string",
-          width: 130,
+          width: 150,
           align: "left",
+          // sort:true,
+        },
+        {
+          field: "batchNo",
+          title: "鐗╂枡鎵规",
+          type: "string",
+          width: 120,
+          align: "left",
+          // sort:true,
         },
         {
           field: "orderNo",
           title: "鍗曟嵁缂栧彿",
-          type: "decimal",
-          width: 130,
-          align: "left",
-        },
-        {
-          field: "batchNo",
-          title: "鎵规鍙�",
           type: "string",
           width: 180,
           align: "left",
         },
         {
-          field: "materielSpec",
-          title: "瑙勬牸鍨嬪彿",
+          field: "supplierBatch",
+          title: "渚涘簲鍟嗘壒娆�",
           type: "string",
-          width: 180,
+          width: 150,
           align: "left",
-        },
-        {
-          field: "serialNumber",
-          title: "搴忓垪鍙�",
-          type: "int",
-          width: 120,
-          align: "left",
-          hidden: true,
         },
         {
           field: "stockQuantity",
-          title: "搴撳瓨鏁伴噺",
+          title: "鐗╂枡鏁伴噺",
           type: "string",
           width: 80,
-          align: "left",
-        },
-        {
-          field: "outboundQuantity",
-          title: "鍑哄簱鏁伴噺",
-          type: "string",
-          width: 80,
-          align: "left",
-        },
-        {
-          field: "unit",
-          title: "鍗曚綅",
-          type: "string",
-          width: 50,
-          align: "left",
-        },
-        {
-          field: "productionDate",
-          title: "鐢熶骇鏃ユ湡",
-          type: "string",
-          width: 120,
-          align: "left",
-        },
-        {
-          field: "effectiveDate",
-          title: "鏈夋晥鏃ユ湡",
-          type: "string",
-          width: 120,
           align: "left",
         },
         {
@@ -332,7 +307,7 @@
           type: "string",
           width: 120,
           align: "left",
-          bind: { key: "stockStatusEmun", data: [] }
+          bind: { key: "stockStatusEmun", data: [] },
         },
         {
           field: "creater",
@@ -340,7 +315,7 @@
           type: "string",
           width: 90,
           align: "left",
-          hidden: true
+          // sort:true,
         },
         {
           field: "createDate",
@@ -348,7 +323,7 @@
           type: "datetime",
           width: 160,
           align: "left",
-          hidden: true
+          sort: true,
         },
         {
           field: "modifier",
@@ -356,7 +331,7 @@
           type: "string",
           width: 100,
           align: "left",
-          hidden: true
+          hidden: true,
         },
         {
           field: "modifyDate",
@@ -364,7 +339,7 @@
           type: "datetime",
           width: 160,
           align: "left",
-          hidden: true
+          hidden: true,
         },
         {
           field: "remark",
@@ -372,7 +347,7 @@
           type: "string",
           width: 100,
           align: "left",
-          hidden: true
+          hidden: true,
         },
       ],
       sortName: "id",

--
Gitblit v1.9.3