From ea037964dba48654bdaf7169517c64508984841e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 19 七月 2021 14:53: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