From d039237604c59e94d3a4f86ba7f8f93343ebef19 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 25 十二月 2025 16:01:28 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue |   70 ++++++-----------------------------
 1 files changed, 12 insertions(+), 58 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
index 2b97cf8..9106f80 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
@@ -54,19 +54,22 @@
           type: "string",
         },
       ],
-      
+
     ]);
     const searchFormFields = ref({
       materielCode: "",
       materielName: "",
-      orderNo: "",
+      batchNo: "",
+      supplyCode: "",
+      warehouseCode: ""
     });
     const searchFormOptions = ref([
       [
-        { title: "鐗╂枡缂栧彿", field: "materielCode" ,type:'like'},
-        { title: "鐗╂枡鍚嶇О", field: "materielName" ,type:'like'},
-        { title: "鍗曟嵁缂栧彿", field: "orderNo" ,type:'like'},
-        { title: "鎵樼洏鍙�", field: "palletCode" ,type:'like'},
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: 'like' },
+        { title: "鐗╂枡鍚嶇О", field: "materielName", type: 'like' },
+        { title: "鎵规鍙�", field: "batchNo", type: 'like' },
+        { title: "渚涘簲鍟嗙紪鍙�", field: "supplyCode", type: 'like' },
+        { title: "浠撳簱鍙�", field: "warehouseCode", type: 'like' },
       ],
     ]);
     const columns = ref([
@@ -93,6 +96,7 @@
         type: "string",
         width: 150,
         align: "left",
+        bind: { key: "materielInfo", data: [] },
       },
       {
         field: "batchNo",
@@ -114,64 +118,14 @@
         type: "string",
         width: 120,
         align: "left",
-      },        
+      },
       {
         field: "stockQuantity",
         title: "搴撳瓨鏁伴噺",
         type: "string",
         width: 200,
         align: "left",
-      },
-      {
-        field: "outboundQuantity",
-        title: "鍑哄簱鏁伴噺",
-        type: "string",
-        width: 180,
-        align: "left",
-      },
-      {
-        field: "status",
-        title: "搴撳瓨鏄庣粏鐘舵��",
-        type: "string",
-        width: 120,
-        align: "left",
-        bind: { key: "stockStatusEmun", data: [] },
-      },
-      {
-        field: "creater",
-        title: "鍒涘缓浜�",
-        type: "string",
-        width: 90,
-        align: "left",
-      },
-      {
-        field: "createDate",
-        title: "鍒涘缓鏃堕棿",
-        type: "datetime",
-        width: 160,
-        align: "left",
-      },
-      {
-        field: "modifier",
-        title: "淇敼浜�",
-        type: "string",
-        width: 100,
-        align: "left",
-      },
-      {
-        field: "modifyDate",
-        title: "淇敼鏃堕棿",
-        type: "datetime",
-        width: 160,
-        align: "left",
-      },
-      {
-        field: "remark",
-        title: "澶囨敞",
-        type: "string",
-        width: 100,
-        align: "left",
-      },
+      }
     ]);
     const detail = ref({
       cnName: "#detailCnName",

--
Gitblit v1.9.3