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/Liaotian/Indexcheck.cshtml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml b/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
index 5cd072b..d23e13c 100644
--- a/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
@@ -17,7 +17,7 @@
{
label: '闂', name: 'Question', labtype: 'txt', hidden: false, width: 400 ,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('" + cellvalue + "','98%','100%', '/Liaotian/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ return "<a onclick=\"OpenWindow('淇敼闂','98%','100%', '/Liaotian/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
}
},
{ label: '鍥炵瓟', name: 'Anwser', labtype: 'textarea', hidden: false, width: 800 },
@@ -33,7 +33,21 @@
- } },
+ }
+ },
+ {
+ label: '鏄惁鍑轰功', name: 'ChushuStatus', labtype: 'txt', hidden: false, width: 100,
+ formatter: function (cellvalue, options, rowObject) {
+ if (cellvalue == "D") {
+ return "鍚�"
+ } else {
+ return "鏄�"
+ }
+
+
+
+ }
+ },
{ label: '鐘舵��', name: 'RecStatus', labtype: 'txt', hidden: true },
{ label: '鍒涘缓浜�', name: 'Creater', labtype: 'txt', hidden: true },
{ label: '鍒涘缓鏃堕棿', name: 'Createtimetxt', labtype: 'txt', hidden: true },
@@ -50,8 +64,8 @@
{ label: '鏄惁瀹℃牳', name: 'Shifoushenhe', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
{ label: '褰曞叆鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
{ label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater), cwidth: '5%', cccwidth: '8%' },
-
-
+ { label: '鏄惁鍑轰功', name: 'ChushuStatus', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
+ //{ label: '鏄惁鏀惰棌', name: 'ShouCangStatus', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
];
var _pageAdd = function () {
OpenWindow("鏂板闂", "98%", "90%", "/Liaotian/Edit/");
@@ -175,11 +189,43 @@
}
+
+
+
+ //function sendHuidaStatus() {
+
+ // var msg = $("#PBSShifoushenhe");
+
+
+ // if (msg.length > 0) {
+ // $("#PBSShifoushenhe").val("D");
+ // $("#PBSShifoushenhe").trigger('chosen:updated');//鏇存柊閫夐」
+ // //_pageSearch();
+ // } else {
+ // setTimeout(sendHuidaStatus, 1000);
+ // }
+ //}
+ //sendHuidaStatus();
send();
+
+
+
+
+
-
+ $(document).ready(function () {
+ setTimeout(
+ function () {
+ $("#PBSShifoushenhe").val("D");
+ $("#PBSShifoushenhe").trigger('chosen:updated');//鏇存柊閫夐」
+ _pageSearch();
+ }, 2000);
+
+
+ });
+
--
Gitblit v1.9.1