From f78fae4c3fdc85f2a16530ff054204eefcbbb00d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 25 八月 2026 18:53:10 +0800
Subject: [PATCH] Merge branch 'dev_天津_建诚恒商贸' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_建诚恒商贸

---
 src/views/productionManagement/productionReporting/index.vue |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index fa4e163..db5a34d 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -186,11 +186,11 @@
       prop: "nickName",
       width: 120,
     },
-    {
-      label: "宸ユ椂锛坔锛�",
-      width: 100,
-      prop: "workHour",
-    },
+    // {
+    //   label: "宸ユ椂锛坔锛�",
+    //   width: 100,
+    //   prop: "workHour",
+    // },
     {
       label: "宸ュ簭",
       prop: "process",
@@ -236,6 +236,7 @@
       label: "鍒涘缓鏃堕棿",
       prop: "createTime",
       width: 120,
+      dataType: "date"
     },
     {
       dataType: "action",

--
Gitblit v1.9.3