From 32898366256ac7a99c4ecdd094e05e54f8a7e621 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期五, 26 十二月 2025 09:28:58 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
index 0b94c04..6aee2bd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
@@ -54,18 +54,20 @@
type: "string",
},
],
-
+
]);
const searchFormFields = ref({
materielCode: "",
materielName: "",
orderNo: "",
+ palletCode: ""
});
const searchFormOptions = ref([
[
- { title: "鐗╂枡缂栧彿", field: "materielCode" },
- { title: "鐗╂枡鍚嶇О", field: "materielName" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: 'like' },
+ { title: "鐗╂枡鍚嶇О", field: "materielName", type: 'like' },
+ { title: "鍗曟嵁缂栧彿", field: "orderNo", type: 'like' },
+ { title: "鎵樼洏鍙�", field: "palletCode", type: 'like' },
],
]);
const columns = ref([
@@ -87,6 +89,13 @@
align: "left",
},
{
+ field: "palletCode",
+ title: "鎵樼洏缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "string",
@@ -99,25 +108,48 @@
type: "string",
width: 150,
align: "left",
+ bind: { key: "materielInfo", data: [] },
},
{
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "decimal",
- width: 90,
+ width: 150,
align: "left",
},
{
field: "batchNo",
title: "鎵规鍙�",
type: "string",
- width: 90,
+ width: 150,
align: "left",
},
{
field: "serialNumber",
title: "搴忓垪鍙�",
type: "int",
+ width: 120,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "supplyCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "warehouseCode",
+ title: "浠撳簱鍙�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "barcode",
+ title: "鏉＄爜",
+ type: "string",
width: 120,
align: "left",
},
@@ -132,7 +164,7 @@
field: "outboundQuantity",
title: "鍑哄簱鏁伴噺",
type: "string",
- width: 180,
+ width: 120,
align: "left",
},
{
@@ -177,6 +209,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true,
},
]);
const detail = ref({
--
Gitblit v1.9.3