From 526b70eecc5dac5aea91bfffbe0b98118f25827f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 23 六月 2025 09:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 00422e9..6b61d28 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"
@@ -48,6 +48,7 @@
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
+ readonly:true
},
{
title: "涓婃父鍗曟嵁缂栧彿",
@@ -101,7 +102,7 @@
title: "鍗曟嵁鐘舵��",
field: "orderStatus",
type: "select",
- dataKey: "inboundState",
+ dataKey: "outboundStatusEnum",
data: [],
},
],
@@ -115,6 +116,7 @@
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
],
]);
const columns = ref([
@@ -142,7 +144,7 @@
type: "string",
width: 160,
align: "left",
- link: true,
+ // link: true,
},
{
field: "upperOrderNo",
@@ -174,6 +176,21 @@
width: 120,
align: "left",
bind: { key: "createType", data: [] },
+ },
+ {
+ field: "departmentCode",
+ title: "淇敼鏃堕棿",
+ type: "string",
+ width: 120,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "departmentName",
+ title: "閮ㄩ棬鍚嶇О",
+ type: "string",
+ width: 160,
+ align: "left",
},
{
field: "creater",
@@ -269,6 +286,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