From 4bc0e18b94a2bf17c1b7277910d63ef82fbe616a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 10 一月 2025 09:39:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 539b152..ff1cc15 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -32,6 +32,7 @@
upperOrderNo: "",
orderStatus: "",
remark: "",
+ warehouseId:""
});
const editFormOptions = ref([
[
@@ -47,6 +48,7 @@
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
+ readonly:true
},
{
title: "涓婃父鍗曟嵁缂栧彿",
@@ -60,6 +62,14 @@
dataKey: "inboundState",
data: [],
readonly: true,
+ },
+ {
+ title: "浠撳簱",
+ field: "warehouseId",
+ type: "select",
+ dataKey: "warehouses",
+ data: [],
+ required: true,
},
{
title: "澶囨敞",
@@ -120,18 +130,26 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind:{key: "warehouses", data: []}
+ },
+ {
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
- width: 120,
+ width: 160,
align: "left",
- link: true,
+ // link: true,
},
{
field: "upperOrderNo",
title: "涓婃父鍗曟嵁缂栧彿",
type: "string",
- width: 150,
+ width: 160,
align: "left",
},
{
@@ -154,7 +172,7 @@
field: "createType",
title: "鍒涘缓鏂瑰紡",
type: "string",
- width: 90,
+ width: 120,
align: "left",
bind: { key: "createType", data: [] },
},
@@ -252,6 +270,15 @@
required: true,
},
{
+ field: "rowNo",
+ title: "琛屽彿",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "number" },
+ required: true,
+ },
+ {
field: "lockQuantity",
title: "閿佸畾鏁伴噺",
type: "int",
--
Gitblit v1.9.3