From 83c4efe25b7b5ee027a34987f8ee508a379c1d47 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 九月 2021 15:38:12 +0800
Subject: [PATCH] 工资修改

---
 zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml |   99 +++++++++++++++++++++++++++++++------------------
 1 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
index a1916d3..395c424 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
@@ -16,18 +16,18 @@
         shrinkToFit = false;
         footerrow = false;
 
-        dataCol = [            
+        dataCol = [
             { label: '搴忓彿', name: 'Id', labtype: 'txt', hidden: true },
-            { label: '宸ュ彿', name: 'Usernumber', labtype: 'txt', hidden: false, width: 100},
+            { label: '宸ュ彿', name: 'Usernumber', labtype: 'txt', hidden: false, width: 80},
             {
-                label: '濮撳悕', name: 'UserName', labtype: 'txt', hidden: false, width: 100,
+                label: '濮撳悕', name: 'UserName', labtype: 'txt', hidden: false, width: 60,
                 formatter: function (cellvalue, options, rowObject) {
                     return "<a onclick=\"OpenWindow('宸ヨ祫鏍稿噯','60%','55%', '/SalaryCheck/Edit?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                 }
-            },            
-            { label: '宸ヨ祫鏈堜唤', name: 'YearMonth', labtype: 'txt', hidden: false, width: 100 },       
+            },
+            { label: '宸ヨ祫鏈堜唤', name: 'YearMonth', labtype: 'txt', hidden: false, width: 80 },
             {
-                label: '鐘舵��', name: 'IslockChs', labtype: 'txt', hidden: false, width: 100, formatter: function (cellvalue, options, rowObject) {
+                label: '鐘舵��', name: 'IslockChs', labtype: 'txt', hidden: false, width: 60, formatter: function (cellvalue, options, rowObject) {
                     switch (rowObject.Islock) {
                         case 'S':
                             return '<b style="color: red">' + cellvalue + '</b>';
@@ -45,54 +45,81 @@
                     //}
                 }
             },
-            { label: '宸ヤ綔閮ㄩ棬', name: 'DeptName', labtype: 'txt', hidden: false, width: 120 },            
-            { label: '鍩烘湰宸ヨ祫', name: 'Jibengongzi', labtype: 'txt', hidden: false, width: 100 },
-            { label: '淇濆瘑璐�', name: 'Baomifei', labtype: 'txt', hidden: false, width: 100 },
-            { label: '宸ヤ綔琛ヨ创', name: 'Gongzuobutie', labtype: 'txt', hidden: false, width: 100 },
-            { label: '鍔犵彮宸ヨ祫', name: 'Jiabangongzi', labtype: 'txt', hidden: false, width: 100 },
-            { label: '绀句繚', name: 'Shebao', labtype: 'txt', hidden: false, width: 100 },
-            { label: '鐢佃瘽琛ヨ创', name: 'DianhuabutieChs', labtype: 'txt', hidden: false, width: 100 },
-            { label: '鍏ㄥ嫟濂�', name: 'Quanqinjiang', labtype: 'txt', hidden: false, width: 100 },
-            { label: '浜ら�氳ˉ璐�', name: 'Jiaotngbutie', labtype: 'txt', hidden: false, width: 100 },
-            { label: '缁╂晥鎻愭垚', name: 'Jixiaoticheng', labtype: 'txt', hidden: false, width: 100 },
-            { label: '濂栭噾', name: 'Jiangjin', labtype: 'txt', hidden: false, width: 100 },
-            { label: '琛ュ彂宸ヨ祫', name: 'Bufagongzi', labtype: 'txt', hidden: false, width: 100 },
-            { label: '鍚堣', name: 'sum_fgz', labtype: 'txt', hidden: false, width: 100 },
+            { label: '宸ヤ綔閮ㄩ棬', name: 'DeptName', labtype: 'txt', hidden: false, width: 80 },
+            { label: '鍩烘湰宸ヨ祫', name: 'Jibengongzi', labtype: 'txt', hidden: false, width: 60 },
+            { label: '淇濆瘑璐�', name: 'Baomifei', labtype: 'txt', hidden: false, width: 60 },
+            { label: '宸ヤ綔琛ヨ创', name: 'Gongzuobutie', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鍔犵彮宸ヨ祫', name: 'Jiabangongzi', labtype: 'txt', hidden: false, width: 60 },
+            { label: '绀句繚', name: 'Shebao', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鐢佃瘽琛ヨ创', name: 'DianhuabutieChs', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鍏ㄥ嫟濂�', name: 'Quanqinjiang', labtype: 'txt', hidden: false, width: 60 },
+            { label: '浜ら�氳ˉ璐�', name: 'Jiaotngbutie', labtype: 'txt', hidden: false, width: 60 },
+            { label: '缁╂晥鎻愭垚', name: 'Jixiaoticheng', labtype: 'txt', hidden: false, width: 60 },
+            { label: '濂栭噾', name: 'Jiangjin', labtype: 'txt', hidden: false, width: 60 },
+            { label: '琛ュ彂宸ヨ祫', name: 'Bufagongzi', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鍚堣', name: 'sum_fgz', labtype: 'txt', hidden: false, width: 60 },
 
-            { label: '涓汉绀句繚', name: 'Shebaokou', labtype: 'txt', hidden: false, width: 100 },
-            { label: '涓◣', name: 'Geshui', labtype: 'txt', hidden: false, width: 100 },
-            { label: '鐢佃瘽璐�', name: 'Dianhuafei', labtype: 'txt', hidden: false, width: 100 },            
-            { label: '缂哄嫟', name: 'Queqin', labtype: 'txt', hidden: false, width: 100 },
-            { label: '缃氭', name: 'Fakuan', labtype: 'txt', hidden: false, width: 100 },
-            { label: '璧斿伩', name: 'Peichang', labtype: 'txt', hidden: false, width: 100 },
-            { label: '绾犻敊', name: 'Jiucuo', labtype: 'txt', hidden: false, width: 100 },
-            { label: '鍚堣', name: 'sum_kgz', labtype: 'txt', hidden: false, width: 100 },
+            { label: '涓汉绀句繚', name: 'Shebaokou', labtype: 'txt', hidden: false, width: 60 },
+            { label: '涓◣', name: 'Geshui', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鐢佃瘽璐�', name: 'Dianhuafei', labtype: 'txt', hidden: false, width: 60 },
+            { label: '缂哄嫟', name: 'Queqin', labtype: 'txt', hidden: false, width: 60 },
+            { label: '缃氭', name: 'Fakuan', labtype: 'txt', hidden: false, width: 60 },
+            { label: '璧斿伩', name: 'Peichang', labtype: 'txt', hidden: false, width: 60 },
+            { label: '绾犻敊', name: 'Jiucuo', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鍚堣', name: 'sum_kgz', labtype: 'txt', hidden: false, width: 60 },
 
-            { label: '鍒拌处宸ヨ祫', name: 'Daozhanggongzi', labtype: 'txt', hidden: false, width: 100 },
-            { label: '棰勫彂宸ヨ祫', name: 'Yufagongzi', labtype: 'txt', hidden: false, width: 100 },
-            { label: '棰勫彂宸ヨ祫鍚堣', name: 'Yufagongziheji', labtype: 'txt', hidden: false, width: 100 },       
+            { label: '鍒拌处宸ヨ祫', name: 'Daozhanggongzi', labtype: 'txt', hidden: false, width: 60 },
+            { label: '棰勫彂宸ヨ祫', name: 'Yufagongzi', labtype: 'txt', hidden: false, width: 60 },
+            { label: '棰勫彂宸ヨ祫鍚堣', name: 'Yufagongziheji', labtype: 'txt', hidden: false, width: 60 },
         ];
-        dataUrl = "/SalaryCheck/GetList";
+        dataUrl = "/SalaryCheck/GetList?YearMonth222=" + getNowFormatDate();
         searchCol = [
             { label: '鏈堜唤', name: 'YearMonth', labtype: 'monthdate', hidden: false, cwidth: '5%', cccwidth: '8%' },
             { label: '宸ヤ綔閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
             { label: '鑱屽伐濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
         ];
+        //var _pageSearch = function () {
+        //    $("#jqGrid").jqGrid('setGridParam', {
+        //        url: '/SalaryCheck/GetList', postData: jsons, page: 1
+        //    }); //閲嶆柊杞藉叆
+        //    var jsons = GetSearchEnd();
+        //    if (jsons == false) {
+        //        msg.info("璇峰綍鍏ユ煡璇㈡潯浠�");
+        //        return false;
+        //    }
+        //    LoadGrid(jsons);
+        //}
 
         $(function () {
-
+            $("#PBSYearMonth").val(getNowFormatDate());
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({ 'overflow-x': 'scroll' });
-
+          
             jQuery("#jqGrid").jqGrid('setGroupHeaders', {
-                useColSpanStyle: true, 
+                useColSpanStyle: true,
                 groupHeaders: [
                     { startColumnName: 'Jibengongzi', numberOfColumns: 12, titleText: '搴斿彂宸ヨ祫' },
                     { startColumnName: 'Shebaokou', numberOfColumns: 8, titleText: '搴旀墸宸ヨ祫' }
                 ]
-            });           
-            
+            });
+          
         });
 
+        function getNowFormatDate() {
+            var date = new Date();
+            var seperator1 = "-";
+            var year = date.getFullYear();
+            var month = date.getMonth();
+            var strDate = date.getDate();
+            if (month >= 1 && month <= 9) {
+                month = "0" + month;
+            }
+            if (strDate >= 0 && strDate <= 9) {
+                strDate = "0" + strDate;
+            }
+            var currentdate = year + seperator1 + month;//+ seperator1 + strDate;
+            return currentdate;
+        }
+
         var _pageEdit = function () {
             var id = jQuery("#jqGrid").jqGrid('getGridParam', 'selrow');
             if (id) {

--
Gitblit v1.9.1