From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 20 九月 2025 15:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu

---
 项目代码/WMS/WMSClient/src/views/stock/stockInfo.vue |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue"
index ccc4acd..595d77d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue"
@@ -45,11 +45,20 @@
       const searchFormFields = ref({
         palletCode: "",
         locationCode: "",
+        materielCode: "",
+        materielWide: "",
       });
       const searchFormOptions = ref([
         [
-          { title: "鎵樼洏缂栧彿", field: "palletCode" },
-          { title: "璐т綅缂栧彿", field: "locationCode" },
+          { title: "鎵樼洏缂栧彿", field: "palletCode",type:"like" },
+          { title: "璐т綅缂栧彿", field: "locationCode",type:"like" },
+          {title: "搴撳瓨缁勭粐", field:"materielInvOrgId",type:"select",dataKey:"materielInvOrgEnum",data:[]},
+          {title: "鐗╂枡缂栧彿", field:"materielCode",type:"like"},
+        ],
+        [
+          {title: "鐗╂枡骞呭", field:"materielWide",type:"int"},
+          {title: "搴撳瓨鐘舵��", field:"stockStatus",type:"select",dataKey:"stockStatusEmun",data:[]},
+          { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
         ],
       ]);
       const columns = ref([
@@ -132,6 +141,13 @@
         bind: { key: "stockStatusEmun", data: [] },
       },
       {
+          field: "stockLength",
+          title: "搴撳瓨鎬婚暱",
+          type: "string",
+          width: 110,
+          align: "left",
+      },
+      {
           field: "materielWeight",
           title: "鐗╂枡閲嶉噺",
           type: "string",

--
Gitblit v1.9.3