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/Signin/Signin.cshtml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml
index 28ea710..fa2198e 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml
@@ -10,6 +10,13 @@
<script type="text/javascript">
var year = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.year))';
var month = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.month))';
+
+ var myDate = new Date();
+ //鑾峰彇褰撳墠骞�
+ var searchyear = myDate.getFullYear();
+ //鑾峰彇褰撳墠鏈�
+ var searchmonth = myDate.getMonth() + 1;
+
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
@@ -42,8 +49,8 @@
//?userId=" + "@ViewBag.userId";
searchCol = [
- { label: '鏌ヨ鏃堕棿:骞�', name: 'Year', labtype: 'combox', hidden: false, defultvalue: JSON.parse(year)[1].code , data: JSON.parse(year), cwidth: '5%', cccwidth: '9%' },
- { label: '鏈�', name: 'Month', labtype: 'combox', hidden: false, data: JSON.parse(month), cwidth: '1%', cccwidth: '7%' }
+ { label: '鏌ヨ鏃堕棿锛氬勾', name: 'Year', labtype: 'combox', hidden: false, defultvalue: searchyear , data: JSON.parse(year), cwidth: '5%', cccwidth: '9%' },
+ { label: '鏈�', name: 'Month', labtype: 'combox', hidden: false, defultvalue: searchmonth ,data: JSON.parse(month), cwidth: '1%', cccwidth: '7%' }
];
--
Gitblit v1.9.1