From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
index e135a69..583abee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
@@ -94,7 +94,7 @@
           title: "鍥炰紶MES鐘舵��",
           field: "returnToMESStatus",
           type: "select",
-          dataKey: "returnToMESStatus",
+          dataKey: "outboundReturnToMESStatus",
           data: [],
         },
         { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
@@ -339,6 +339,13 @@
           bind: { key: "orderDetailStatusEnum", data: [] },
         },
         {
+          field: "pallet",
+          title: "宸茬粍鎵樼洏鍙�",
+          type: "string",
+          width: 180,
+          align: "left",
+        },
+        {
           field: "creater",
           title: "鍒涘缓浜�",
           type: "string",

--
Gitblit v1.9.3