From a1ee30471cb90cbea25627d5dddcb979bb612693 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期日, 19 一月 2025 14:08:42 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue | 13 ++++++++++++-
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue | 6 +++---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 6 +++---
代码管理/WMS/WIDESEA_WMSClient/public/webconfig.js | 2 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 5 +++--
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js"
index 9ca9383..91884d8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js"
@@ -1,4 +1,4 @@
window.webConfig = {
- "webApiBaseUrl": "http://127.0.0.1:9293/",
+ "webApiBaseUrl": "http://10.30.5.60:9293/",
"webApiProduction":"http://10.30.4.92:9283/"
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
index 468e67d..bb374b8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
@@ -98,7 +98,10 @@
palletCode: "",
});
const searchFormOptions = ref([
- [{ title: "鎵规鍙�", field: "lotNo", type: "like" }],
+ [
+ { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+ ],
]);
const columns = ref([
{
@@ -119,6 +122,14 @@
align: "left",
},
{
+ field: "materielCode",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 100,
+ align: "left",
+ bind: { key: "MaterielNames", data: [] },
+ },
+ {
field: "warehouseId",
title: "浠撳簱",
type: "string",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 517719b..0f6b3d0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -225,12 +225,12 @@
required: true,
},
{
- field: "materielName",
+ field: "materielCode",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 100,
align: "left",
- edit: { type: "" },
+ bind: { key: "MaterielNames", data: [] },
},
{
field: "batchNo",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
index 6fce489..8851231 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
@@ -215,12 +215,12 @@
required: true,
},
{
- field: "materielName",
+ field: "materielCode",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 100,
align: "left",
- edit: { type: "" },
+ bind: { key: "MaterielNames", data: [] },
},
// {
// field: "batchNo",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
index 4eb6919..4d9407f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
@@ -267,11 +267,12 @@
required: true,
},
{
- field: "materielName",
+ field: "materielCode",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 100,
align: "left",
+ bind: { key: "MaterielNames", data: [] },
},
{
field: "lotNo",
--
Gitblit v1.9.3