From cf83e0828b286b61b69a15005e6247d8b03f4cd8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期日, 16 十一月 2025 19:14:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index cbe4d0b..270d8d1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -147,14 +147,6 @@
         align: "left",
       },
       {
-        field: "warehouseId",
-        title: "浠撳簱",
-        type: "string",
-        width: 90,
-        align: "left",
-        bind:{key: "warehouses", data: []}
-      },
-      {
         field: "orderNo",
         title: "鍗曟嵁缂栧彿",
         type: "string",
@@ -178,6 +170,14 @@
         bind: { key: "outOrderType", data: [] },
       },
       {
+        field: "businessType",
+        title: "涓氬姟绫诲瀷",
+        type: "string",
+        width: 150,
+        align: "left",
+        bind: { key: "businessType", data: [] },
+      },
+      {
         field: "orderStatus",
         title: "鍗曟嵁鐘舵��",
         type: "decimal",
@@ -192,6 +192,13 @@
         width: 120,
         align: "left",
         bind: { key: "createType", data: [] },
+      },
+      {
+        field: "factoryArea",
+        title: "鍘傚尯",
+        type: "string",
+        width: 120,
+        align: "left"
       },
       {
         field: "departmentCode",
@@ -293,6 +300,15 @@
           required: true,
         },
         {
+          field: "supplyCode",
+          title: "渚涘簲鍟嗙紪鍙�",
+          type: "string",
+          width: 90,
+          align: "left",
+          edit: { type: "string" },
+          required: true,
+        },
+        {
           field: "orderQuantity",
           title: "鍗曟嵁鏁伴噺",
           type: "string",

--
Gitblit v1.9.3