From 7d180121d133a3f2400ca2870cfb6cacd605d6cf Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 12 八月 2025 23:12:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue"
index 0811f3f..561afc3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue"
@@ -93,25 +93,19 @@
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ field: "proOrderType",
type: "select",
- dataKey: "outOrderType",
+ dataKey: "proOutOrderTypeEnum",
data: [],
},
- {
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "outboundStatusEnum",
- data: [],
- },
+
],
[
{
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
+ title: "鍗曟嵁鐘舵��",
+ field: "proOrderStatus",
type: "select",
- dataKey: "createType",
+ dataKey: "outboundStatusEnum",
data: [],
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
--
Gitblit v1.9.3