From 9b6ad3e202d43f47729fa8e91ca5ccc871c8c4b9 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 03 十二月 2025 10:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
index 3acaf44..7015bbe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
@@ -44,7 +44,7 @@
});
const editFormFields = ref({
orderType: "",
- inboundOrderNo: "",
+ orderNo: "",
upperOrderNo: "",
remark: "",
});
@@ -59,7 +59,7 @@
data: [],
},
{
- field: "inboundOrderNo",
+ field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
},
@@ -76,7 +76,7 @@
],
]);
const searchFormFields = ref({
- inboundOrderNo: "",
+ orderNo: "",
upperOrderNo: "",
orderType: "115",
orderStatus: "",
@@ -86,7 +86,7 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
+ { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
@@ -127,7 +127,7 @@
align: "left",
},
{
- field: "inboundOrderNo",
+ field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
width: 120,
@@ -174,6 +174,20 @@
bind: { key: "createType", data: [] },
},
{
+ field: "fromWarehouse",
+ title: "璋冨嚭浠撳簱",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "toWarehouse",
+ title: "璋冨叆浠撳簱",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
field: "factoryArea",
title: "鍘傚尯",
type: "string",
--
Gitblit v1.9.3