From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:45 +0800
Subject: [PATCH] 今日开发   加班申请·                统计报表:没有任何工作的人,不显示。显示人员的      部门  职位  姓名   工作时间                   在计算考勤的时候只有有加班申请的加班才算加班

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

diff --git a/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoBook.cshtml b/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoBook.cshtml
index 0b809b4..bb63588 100644
--- a/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoBook.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoBook.cshtml
@@ -15,9 +15,9 @@
                 }
             },
             {
-                label: '鎻愰啋鏃堕棿', name: 'Time', labtype: 'txt', width: 100, hidden: false,
+                label: '鎻愰啋鏃堕棿', name: 'TimeName', labtype: 'txt', width: 100, hidden: false,
                 formatter: function (cellvalue, options, rowObject) {
-                    return '<a href="javascript: void (0)" onclick="edit(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');">' + new Date(cellvalue).Format("yyyy-MM-dd hh:mm") + '</a>';
+                    return '<a href="javascript: void (0)" onclick="edit(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');">' + cellvalue + '</a>';
                 }
             },
             //{

--
Gitblit v1.9.1