From d67cb0c9792e23be7ccf655675cb32ac1a236b7b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 十一月 2022 09:49:22 +0800
Subject: [PATCH] 在人事管理页面增加查看员工考勤记录功能
---
zhengcaioa/zhengcaioa/Views/Project/Select.cshtml | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
index 48f9f0a..76e8649 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
@@ -16,7 +16,7 @@
var ShiFouyReasonname = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShiFouyReasonname))';
var Baomingtimebegin = '@Html.Raw(ViewBag.Baomingtimebegin)';
var Baomingtimeend = '@Html.Raw(ViewBag.Baomingtimeend)';
-
+ var wanshan = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.wanshan))';
loseherght = 110;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -35,6 +35,9 @@
var color = "";
if (rowObject.Fblx != null && rowObject.Fblx != '') {
color = "red";
+ }
+ if (rowObject.Creater != null && rowObject.Creater == '111') {
+ color = "orange";
}
return "<a onclick=\"OpenWindow('" + cellvalue + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\" ><span style='color:" + color + ";'>" + cellvalue + "</span></a>";
@@ -93,7 +96,26 @@
{ label: '鎶曟爣娆℃暟', name: 'Toubiaocishu', labtype: 'txt', hidden: true },
{ label: '涓爣娆℃暟', name: 'Zhongbiaocishu', labtype: 'txt', hidden: true },
{ label: '搴熸爣娆℃暟', name: 'Feibiaocishu', labtype: 'txt', hidden: true },
- { label: '涓爣閲戦', name: 'Zhongbiaojine', labtype: 'txt', hidden: true }
+ { label: '涓爣閲戦', name: 'Zhongbiaojine', labtype: 'txt', hidden: true },
+ {
+ label: '璐ㄧ枒', name: 'Zhiyistatus', labtype: 'txt', hidden: false, width: 60,
+ formatter: function (cellvalue, options, rowObject) {
+
+
+
+ return "<a onclick=\"OpenWindow('" + rowObject.Name + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ }
+ },
+ {
+ label: '鎶曡瘔', name: 'Tousustatus', labtype: 'txt', hidden: false, width: 60,
+ formatter: function (cellvalue, options, rowObject) {
+
+
+
+ return "<a onclick=\"OpenWindow('" + rowObject.Name + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ }
+ },
+
];
dataUrl = "/Project/GetLiaotianList?StartTimestar=" + Baomingtimebegin + "|" + Baomingtimeend +"@(string.IsNullOrEmpty(Creater11) ?"":"&Creater="+ Creater11)";
searchCol = [
@@ -107,7 +129,7 @@
{ label: '椤圭洰鍚嶇О', name: 'Name', labtype: 'txt', hidden: false },
{ label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
- { label: '閲囪喘浠ｇ悊浜�', name: 'Caigourenname', labtype: 'txt', hidden: false },
+ { label: '閲囪喘浜�', name: 'Caigourenname', labtype: 'txt', hidden: false },
{ label: '閲囪喘浠ｇ悊鏈烘瀯', name: 'Dailiname', labtype: 'txt', hidden: false },
{ label: '閲囪喘鏂瑰紡', name: 'Cgfs', labtype: 'combox', hidden: false, data: JSON.parse(projectDropDown) },
@@ -124,9 +146,11 @@
{ label: '鍒嗗樊澶т簬', name: 'Fenchadayu', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
{ label: '渚涘簲鍟嗘暟閲�', name: 'Shuliang', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
//{ label: '浠峰樊灏忎簬', name: 'Baojiachaxiaoyu', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
-
-
-
+ { label: '鏄惁纭', name: 'Shifouqueren', labtype: 'combox', hidden: false, data: JSON.parse(flbx) },
+ { label: '渚涘簲鍟嗕俊鎭�', name: 'Wanshan', labtype: 'combox', hidden: false, data: JSON.parse(wanshan) },
+
+
+
];
var _pageAdd = function () {
OpenWindow("鏂板椤圭洰", "98%", "90%", "/Project/Add/");
@@ -271,7 +295,7 @@
$("#PBSReasonname").parent().after("<br>");
$("#PBSCreater").parent().next().remove();
$("#PBSFenchadayu").parent().after("<br>");
-
+ $("#PBSShifouqueren").parent().next().remove();
$("#PBSStartTimestarend").val(Baomingtimeend);
--
Gitblit v1.9.1