From b21afc26b596a5a7cb77b36cd96f6e0df91637eb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 26 八月 2026 14:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸
---
src/views/productionManagement/productionReporting/index.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index aff050f..db5a34d 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -186,6 +186,11 @@
prop: "nickName",
width: 120,
},
+ // {
+ // label: "宸ユ椂锛坔锛�",
+ // width: 100,
+ // prop: "workHour",
+ // },
{
label: "宸ュ簭",
prop: "process",
@@ -231,6 +236,7 @@
label: "鍒涘缓鏃堕棿",
prop: "createTime",
width: 120,
+ dataType: "date"
},
{
dataType: "action",
--
Gitblit v1.9.3