From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:45 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
index 117c4b6..64c4f05 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
@@ -4,7 +4,7 @@
}
@section headerStyle{
<script type="text/javascript">
- var PayType = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.PayType))';
+ @*var PayType = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.PayType))';*@
var DeptId = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.DeptId))';
loseherght = 30;
@@ -26,12 +26,13 @@
{ label: '宸ヤ綔鍐呭', name: 'Remark', labtype: 'txt', hidden: false, width: 100 },
{ label: '缁╂晥鎻愭垚锛堝厓锛�', name: 'Gongzi', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鏁伴噺', name: 'Shuliang', labtype: 'txt', hidden: false, width: 100 },
];
dataUrl = "/AdmPieceCheck/GetList";
searchCol = [
{ label: '宸ヤ綔鏃堕棿', name: 'WorkTime', labtype: 'datearea', hidden: false },
- { label: '绫诲埆', name: 'PayType', labtype: 'combox', hidden: false, data: JSON.parse(PayType), cwidth: '5%', cccwidth: '8%' },
+ //{ label: '绫诲埆', name: 'PayType', labtype: 'combox', hidden: false, data: JSON.parse(PayType), cwidth: '5%', cccwidth: '8%' },
{ label: '閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(DeptId), cwidth: '5%', cccwidth: '8%' },
{ label: '濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
--
Gitblit v1.9.1