From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
index 2e9884a..aedcef1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
@@ -34,12 +34,14 @@
         { title: "鎵樼洏鍙�", field: "palleCode", type: "like" },
         { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
         { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+        { title: "鍏ュ簱鏉$爜", field: "barcode", type: "like" },
         // { title: "鍙樺姩绫诲瀷", field: "changeType", type: "selectList", dataKey: "stockChangeType", data: [], },
       ],
       [
-        { title: "鍘熸潯鐮�", field: "originalSerilNumber", type: "like" },
-        { title: "浠诲姟鍙�", field: "taskNum", type: "like" },
+        { title: "鍑哄簱鍘熸潯鐮�", field: "originalSerilNumber", type: "like" },
+        { title: "鎷嗗寘鏂版潯鐮�", field: "newSerilNumber", type: "like" },
         { title: "鎵规鍙�", field: "batchNo", type: "like" },
+        { title: "浠撳簱鍙�", field: "warehouseCode", type: "like" },
       ],
     ]);
     const columns = ref([
@@ -59,12 +61,6 @@
         type: "string",
         width: 90,
         align: "left",
-      }, {
-        field: "taskNum",
-        title: "浠诲姟鍙�",
-        type: "string",
-        width: 70,
-        align: "left",
       },
       {
         field: "palleCode",
@@ -80,23 +76,30 @@
         width: 150,
         align: "left",
       },
-      // {
-      //   field: "materielName",
-      //   title: "鐗╂枡鍚嶇О",
-      //   type: "decimal",
-      //   width: 90,
-      //   align: "left",
-      // },
+      {
+        field: "materielName",
+        title: "鐗╂枡鍚嶇О",
+        type: "decimal",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "barcode",
+        title: "鍏ュ簱鏉$爜",
+        type: "string",
+        width: 180,
+        align: "left",
+      },
       {
         field: "originalSerilNumber",
-        title: "鍘熸潯鐮�",
+        title: "鍑哄簱鍘熸潯鐮�",
         type: "string",
         width: 180,
         align: "left",
       },
       {
         field: "newSerilNumber",
-        title: "鏂版潯鐮�",
+        title: "鎷嗗寘鏂版潯鐮�",
         type: "string",
         width: 180,
         align: "left",
@@ -161,6 +164,13 @@
         align: "left",
       },
       {
+        field: "warehouseCode",
+        title: "浠撳簱",
+        type: "string",
+        width: 100,
+        align: "left",
+      },
+      {
         field: "creater",
         title: "鍒涘缓浜�",
         type: "string",

--
Gitblit v1.9.3