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 |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 ff1cc15..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"
@@ -102,7 +102,7 @@
           title: "鍗曟嵁鐘舵��",
           field: "orderStatus",
           type: "select",
-          dataKey: "inboundState",
+          dataKey: "outboundStatusEnum",
           data: [],
         },
       ],
@@ -116,6 +116,7 @@
         },
         { title: "鍒涘缓鑰�", field: "creater", type: "like" },
         { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+        { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
       ],
     ]);
     const columns = ref([
@@ -177,6 +178,21 @@
         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",
         title: "鍒涘缓浜�",
         type: "string",

--
Gitblit v1.9.3