From efad4f05e52c89f3b42774e313144abd039370e4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 二月 2023 11:26:06 +0800
Subject: [PATCH] 考勤怎么加带薪假的计算
---
zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml
index 3d63f05..098cc32 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml
@@ -33,6 +33,13 @@
{ label: '杩熷埌', name: 'Chidao', labtype: 'txt', hidden: false, width: 60 },
{ label: '鏃╅��', name: 'Zaotui', labtype: 'txt', hidden: false, width: 60 },
{ label: '鏃峰伐', name: 'Kuanggong', labtype: 'txt', hidden: false, width: 60 },
+ { label: '甯﹁柂鍋�', name: 'Daixinjia', labtype: 'txt', hidden: false, width: 60 },
+ {
+ label: '鏄庣粏', name: 'mingxi', labtype: 'txt', hidden: false, width: 60,
+ formatter: function (cellvalue, options, rowObject) {
+ return "<a onclick=\"OpenWindow('" + rowObject.UserName + "','98%','100%', '/AdmAttendance/IndexDtl?AttendanceId=" + rowObject.Id + "')\" >鏄庣粏</a>";
+ }
+ },
];
dataUrl = "/AdmAttendance/GetList?YearMonth222=" + getNowFormatDate();
@@ -88,6 +95,10 @@
var year = date.getFullYear();
var month = date.getMonth();
var strDate = date.getDate();
+ if (month == 0) {
+ year = year - 1;
+ month = 12;
+ }
if (month >= 1 && month <= 9) {
month = "0" + month;
}
--
Gitblit v1.9.1