From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
index b4b3fe5..f953f82 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
@@ -28,11 +28,21 @@
{ label: '宸ヨ祫鏈堜唤', name: 'YearMonth', labtype: 'txt', hidden: false, width: 100 },
{
label: '鐘舵��', name: 'IslockChs', labtype: 'txt', hidden: false, width: 100, formatter: function (cellvalue, options, rowObject) {
- if (rowObject.Islock == 'S') {
- return '<b style="color: red">' + cellvalue + '</b>';
- } else {
- return cellvalue;
+ switch (rowObject.Islock) {
+ case 'S':
+ return '<b style="color: red">' + cellvalue + '</b>';
+
+ case 'D':
+ return '<b style="color: blue">' + cellvalue + '</b>';
+
+ default:
+ return cellvalue;
}
+ //if ( == 'S') {
+ // return '<b style="color: red">' + cellvalue + '</b>';
+ //} else {
+ // return cellvalue;
+ //}
}
},
{ label: '宸ヤ綔閮ㄩ棬', name: 'DeptName', labtype: 'txt', hidden: false, width: 120 },
@@ -41,7 +51,7 @@
{ 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: '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 },
@@ -64,7 +74,7 @@
];
dataUrl = "/SalaryCheck/GetList";
searchCol = [
- { label: '宸ュ彿', name: 'Usernumber2', labtype: 'txt', hidden: false },
+ { label: '鏈堜唤', name: 'YearMonth', labtype: 'monthdate', hidden: false },
{ label: '宸ヤ綔閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
{ label: '鑱屽伐濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
];
@@ -86,7 +96,7 @@
var _pageEdit = function () {
var id = jQuery("#jqGrid").jqGrid('getGridParam', 'selrow');
if (id) {
- OpenWindow('宸ヨ祫鏍稿噯', '60%', '55%', '/SalaryCheck/Edit?id=' + id );
+ OpenWindow('宸ヨ祫鏍稿噯', '60%', '65%', '/SalaryCheck/Edit?id=' + id );
} else {
toastr.error("璇峰厛閫変腑1鏉¤褰曪紒");
}
--
Gitblit v1.9.1