From d741e7a7ad7de5045e5c6b6145d9da1783cadecd Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:03 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

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

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
index fc0542e..640b5de 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
@@ -37,7 +37,7 @@
       key: "id",
       footer: "Foots",
       cnName: "璋冩嫧鍗�",
-      name: "Dt_AllocateOrder",
+      name: "AllocateOrder",
       url: "/AllocateOrder/",
       sortName: "id",
     });
@@ -202,7 +202,6 @@
         type: "string",
         width: 120,
         align: "left",
-        link: true, 
       },
       {
         field: "upperOrderNo",
@@ -273,6 +272,13 @@
         align: "left",
       },
       {
+        field: "returnToMESStatus",
+        title: "鍥炰紶鐘舵��",
+        type: "string",
+        width: 100,
+        align: "left",
+      },
+      {
         field: "factoryArea",
         title: "鍘傚尯",
         type: "string",
@@ -294,7 +300,7 @@
         align: "left",
       },
       {
-        field: "modifier",
+        field: "operator",
         title: "淇敼浜�",
         type: "string",
         width: 100,

--
Gitblit v1.9.3