From 3b900af633e710c46b12bdc66eb7bffe005a8c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 15 Nov 2023 10:33:56 +0800
Subject: [PATCH] =?UTF-8?q?EQlevel=E6=8A=A5=E8=A1=A8=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js | 14 +++++++++++++-
 .../src/views/report/EQLevelReport.vue             |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js b/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js
index 0b32721..f71584f 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js
@@ -29,6 +29,17 @@ var dateFilterParams = {
     }
 }
 
+// 2022-08-31T09:45:51.9340433  转 2022-08-31 09:45:51
+var formatTimeStrToStr = function(timeStr) {
+  if (!timeStr || !new Date(timeStr)) {
+    return ''
+  }
+  if (timeStr.lastIndexOf('.') == -1) {
+      return timeStr.replace('T',' ').substring(0,timeStr.length)
+  }
+  return timeStr.replace('T',' ').substring(0,timeStr.lastIndexOf('.'))
+}
+
 // 转换数字小数点保留+千位符
 /**
  * @param {*} number 数值
@@ -66,5 +77,6 @@ export default {
     addEventResizeFlesh:addEventResizeFlesh,
     dateFilterParams:dateFilterParams,
     numberFixedFormatter,
-    numberPercentFormatter
+    numberPercentFormatter,
+    formatTimeStrToStr
 }
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue
index 8f69120..0be0a14 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue
@@ -31,6 +31,7 @@ export default {
         { field: '库位代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物品质量信息',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '标签质量信息',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '收货时间',  cellClass:"centerAlign", valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
       ],
       searchConfig:[
         {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},