From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +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