From 64a8cd04229f7b903913fc3dc7ef4aef267ac3bc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 17:36:14 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' into dev_南通_苏珩

---
 src/views/mes/pro/workorder/data.ts |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index 4cf593e..cdc4573 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -760,6 +760,17 @@
       width: 160,
     },
     {
+      field: 'warehouseName',
+      title: '鎶ュ伐浠撳簱',
+      width: 130,
+      formatter: ({ cellValue, row }) => {
+        if (!cellValue) return '-';
+        return row.areaName
+          ? `${cellValue}/${row.locationName ?? ''}/${row.areaName}`
+          : cellValue;
+      },
+    },
+    {
       field: 'remark',
       title: '澶囨敞',
       minWidth: 120,

--
Gitblit v1.9.3