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

---
 项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue |   12 +++---------
 1 files changed, 3 insertions(+), 9 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 5db27f5..a66d763 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"
@@ -196,7 +196,7 @@
         field: "returnToMESStatus",
         title: "鍥炰紶MES鐘舵��",
         width: 120,
-        bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
+        bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" }] },
       },
       {
         field: "factoryArea",
@@ -214,13 +214,6 @@
         hidden: true
       },
       {
-        field: "departmentName",
-        title: "閮ㄩ棬鍚嶇О",
-        type: "string",
-        width: 160,
-        align: "left",
-      },
-      {
         field: "operator",
         title: "鎿嶄綔浜�",
         type: "string",
@@ -233,6 +226,7 @@
         type: "string",
         width: 90,
         align: "left",
+        hidden: true,
       },
       {
         field: "createDate",
@@ -242,7 +236,7 @@
         align: "left",
       },
       {
-        field: "modifier",
+        field: "operator",
         title: "淇敼浜�",
         type: "string",
         width: 100,

--
Gitblit v1.9.3