From 6f34ab1ed6f8cb79a012a30a7b687e362c6f16c2 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期四, 10 六月 2021 19:08:41 +0800
Subject: [PATCH] 打卡判断,增加前端浏览器mac获取,当mac获取为空时不判断

---
 zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml b/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml
index 03e2f1e..0dbb192 100644
--- a/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml
@@ -19,10 +19,7 @@
             },
             { label: '宸ヤ綔鍐呭', name: 'Context', labtype: 'txt', width: 300, hidden: false },
             {
-                label: '瑕佹眰瀹屾垚鏃堕棿', name: 'Time', labtype: 'txt', width: 100, hidden: false,
-                formatter: function (cellvalue, options, rowObject) {
-                    return new Date(cellvalue).Format("yyyy-MM-dd hh:mm");
-                }
+                label: '瑕佹眰瀹屾垚鏃堕棿', name: 'TimeName', labtype: 'txt', width: 100, hidden: false 
             },
             { label: '鍔炵悊鎯呭喌', name: 'BanLi', labtype: 'txt', width: 300, hidden: false },
             { label: '瀹屾垚鏃堕棿', name: 'WanchengTimeName', labtype: 'txt', width: 100, hidden: false },

--
Gitblit v1.9.1