From f580b664017b7f91ca22983133ba6596e07a8d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 26 Feb 2026 13:15:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms/report):=20=E4=BF=AE=E5=A4=8D=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=E5=8F=98=E9=87=8F=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复两个报表组件中currentDate变量的多余大括号格式错误
在zinc报表中恢复createBy字段的注释状态为实际值
---
 klp-ui/src/views/wms/report/zha/year.vue  |  4 +++-
 klp-ui/src/views/wms/report/zinc/year.vue | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/klp-ui/src/views/wms/report/zha/year.vue b/klp-ui/src/views/wms/report/zha/year.vue
index f85e24b3..63125723 100644
--- a/klp-ui/src/views/wms/report/zha/year.vue
+++ b/klp-ui/src/views/wms/report/zha/year.vue
@@ -161,7 +161,7 @@ export default {
 
     // 获取当前日期（默认选中当天）
     const now = new Date()
-    const currentDate = `${now.getFullYear()}}`
+    const currentDate = `${now.getFullYear()}`
 
     /**
      * 生成指定年份的时间范围字符串
@@ -183,6 +183,8 @@ export default {
       };
     };
 
+    console.log(currentDate)
+
     const { start, end } = getDayTimeRange(currentDate)
 
     return {
diff --git a/klp-ui/src/views/wms/report/zinc/year.vue b/klp-ui/src/views/wms/report/zinc/year.vue
index e7e1802c..96ef2837 100644
--- a/klp-ui/src/views/wms/report/zinc/year.vue
+++ b/klp-ui/src/views/wms/report/zinc/year.vue
@@ -161,7 +161,7 @@ export default {
 
     // 获取当前日期（默认选中当天）
     const now = new Date()
-    const currentDate = `${now.getFullYear()}}`
+    const currentDate = `${now.getFullYear()}`
 
     /**
      * 生成指定年份的时间范围字符串
@@ -224,32 +224,32 @@ export default {
       warehouseQueryMap: {
         '1988150323162836993': {
           selectType: 'product',
-          // createBy: 'suanzhakuguan',
+          createBy: 'suanzhakuguan',
           warehouseId: '1988150323162836993'
         },
         '1988150487185289217': {
           selectType: 'raw_material',
-          // createBy: 'suanzhakuguan',
+          createBy: 'suanzhakuguan',
           warehouseId: '1988150487185289217'
         },
         '2019583656787259393': {
           selectType: 'product',
-          // createBy: 'suanzhakuguan',
+          createBy: 'suanzhakuguan',
           warehouseId: '2019583656787259393'
         },
         '20195833325311414274': {
           selectType: 'product',
-          // createBy: 'suanzhakuguan',
+          createBy: 'suanzhakuguan',
           warehouseId: '20195833325311414274'
         },
         '2019583429955104769': {
           selectType: 'product',
-          // createBy: 'suanzhakuguan',
+          createBy: 'suanzhakuguan',
           warehouseId: '2019583429955104769'
         },
         '2019583137616310273': {
           selectType: 'product',
-          // createBy: 'suanzhakuguan',
+          createBy: 'suanzhakuguan',
           warehouseId: '2019583137616310273'
         },
       },