From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
index 4457c23..0e2f3c5 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
@@ -55,13 +55,13 @@
dataCol = [
{ label: '搴忓彿', name: 'Id', labtype: 'txt', hidden: true },
{ label: '搴忓彿', name: 'Islock', 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,
},
- { 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) {
if (rowObject.Islock == 'S') {
return '<b style="color: red">' + cellvalue + '</b>';
} else {
@@ -69,32 +69,32 @@
}
}
},
- { 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: 'Dianhuabutie', 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: 'Dianhuabutie', 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/EmployeeSalary?month=" + getNowFormatDate();
@@ -128,8 +128,12 @@
var date = new Date();
var seperator1 = "-";
var year = date.getFullYear();
- var month = date.getMonth() + 1;
+ var month = date.getMonth();
var strDate = date.getDate();
+ if (month == 0) {
+ year = year - 1;
+ month = 12;
+ }
if (month >= 1 && month <= 9) {
month = "0" + month;
}
@@ -196,7 +200,7 @@
toastr.error("閿欒鎻愮ず锛氭鏈堜唤宸插畬鎴愮‘璁�,涓嶈兘鐢宠瘔锛�");
}
else {
- OpenWindow('鐢宠瘔', '40%', '50%', '/SalaryCheck/Appeal?id=' + dt);
+ OpenWindow('鐢宠瘔', '80%', '80%', '/SalaryCheck/Appeal?salaryId=' + dt);
}
}
else {
--
Gitblit v1.9.1