From cd259233c8d14b27e745a7657ad46549335fbca9 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期五, 19 十二月 2025 20:21:58 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

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

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 4958422..9108816 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -319,14 +319,14 @@
           align: "left",
           bind: { key: "orderDetailStatusEnum", data: [] },
         },
-        {
-          field: "returnToMESStatus",
-          title: "鍥炰紶鐘舵��",
-          type: "string",
-          width: 90,
-          align: "left",
-          bind: { key: "returnStatus", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] }
-        },
+        // {
+        //   field: "returnToMESStatus",
+        //   title: "鍥炰紶鐘舵��",
+        //   type: "string",
+        //   width: 90,
+        //   align: "left",
+        //   bind: { key: "returnStatus", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] }
+        // },
         {
           field: "creater",
           title: "鍒涘缓浜�",

--
Gitblit v1.9.3