From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +0800
Subject: [PATCH] 今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算
---
zhengcaioa/zhengcaioa/Views/Project/Select.cshtml | 106 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 insertions(+), 13 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
index f88d9fa..de02a90 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
@@ -7,7 +7,11 @@
var projectDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ProjectDropDown))';
var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
var Creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Creater))';
- loseherght = 60;
+ var flbx = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.flbx))';
+ var ShiFouyReasonname = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShiFouyReasonname))';
+
+
+ loseherght = 110;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -21,9 +25,58 @@
{
label: '椤圭洰鍚嶇О', name: 'Name', labtype: 'txt', hidden: false, width: 400 ,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ return "<a onclick=\"OpenWindow('" + cellvalue + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
}
- }, { label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false, width: 100 },
+ }, { label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false, width: 100 },
+ {
+ label: '涓爣渚涘簲鍟�', name: 'Toubiaocishu', labtype: 'txt', hidden: false, width: 400,
+ formatter: function (cellvalue, options, rowObject) {
+ if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
+ var ss = cellvalue.split('銆�');
+ var result = "";
+ for (var i = 0;i < ss.length; i++){
+ result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\" >" + ss[i] + "</a> ";
+ }
+
+ return result;
+ } else {
+ return "";
+ }
+ }
+ },
+ {
+ label: '绗簩鍊欓��', name: 'Drhx', labtype: 'txt', hidden: false, width: 400,
+ formatter: function (cellvalue, options, rowObject) {
+ if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
+ var ss = cellvalue.split('銆�');
+ var result = "";
+ for (var i = 0; i < ss.length; i++) {
+ result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\" >" + ss[i] + "</a> ";
+ }
+
+ return result;
+ } else {
+ return "";
+ }
+
+ }
+ },
+ {
+ label: '绗笁鍊欓��', name: 'Dshx', labtype: 'txt', hidden: false, width: 400,
+ formatter: function (cellvalue, options, rowObject) {
+ if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
+ var ss = cellvalue.split('銆�');
+ var result = "";
+ for (var i = 0; i < ss.length; i++) {
+ result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\" >" + ss[i] + "</a> ";
+ }
+
+ return result;
+ } else {
+ return "";
+ }
+ }
+ },
{ label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false, width: 400 },
{ label: '鎶曟爣娆℃暟', name: 'Toubiaocishu', labtype: 'txt', hidden: true },
{ label: '涓爣娆℃暟', name: 'Zhongbiaocishu', labtype: 'txt', hidden: true },
@@ -32,19 +85,35 @@
];
dataUrl = "/Project/GetLiaotianList";
searchCol = [
- { label: '鍏憡鏃堕棿', name: 'StartTimestar', labtype: 'date', hidden: false },
- { label: '--', name: 'StartTimeend', labtype: 'date', hidden: false, cwidth: '1%', cccwidth: '15%' },
- { label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false },
+ //{ label: '鍏憡鏃堕棿', name: 'StartTimestar', labtype: 'date', hidden: false },
+ //{ label: '--', name: 'StartTimeend', labtype: 'date', hidden: false, cwidth: '1%', cccwidth: '15%' },
+ { label: '鍏憡鏃堕棿', name: 'StartTimestar', labtype: 'datearea', hidden: false },
+ { label: '鐪�', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '2%', cccwidth: '6%' },
+ { label: '', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '0%', cccwidth: '6%' },
+ { label: '', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '0%', cccwidth: '6%' },
+ //{ label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false },
{ label: '椤圭洰鍚嶇О', name: 'Name', labtype: 'txt', hidden: false },
+ { label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
- { label: '鐪�', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '5%', cccwidth: '8%' },
- { label: '甯�', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '1%', cccwidth: '8%' },
- { label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
- { label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false, cwidth: '8.5%', cccwidth: '15%' },
- { label: '渚涘簲鍟�', name: 'Names', 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) },
+ { label: '鏄惁搴熸爣', name: 'fblx', labtype: 'combox', hidden: false, data: JSON.parse(flbx)/*, cwidth: '5%', cccwidth: '8%' */ },
+ { label: '涓爣渚涘簲鍟�', name: 'Names', labtype: 'txt', hidden: false },
+ { label: '鎶曟爣渚涘簲鍟�', name: 'NamesToubiao', labtype: 'txt', hidden: false },
+ { label: '鏄惁鏈夋棤鏁堜緵搴斿晢', name: 'ShiFouyReasonname', labtype: 'combox', hidden: false, data: JSON.parse(ShiFouyReasonname), cwidth: '8%', cccwidth: '12%'},
+ { label: '鏃犳晥渚涘簲鍟�', name: 'Reasonname', labtype: 'txt', hidden: false },
+
{ label: '褰曞叆鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
- { label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater), cwidth: '5%', cccwidth: '8%' },
+ { label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater)/*, cwidth: '5%', cccwidth: '8%'*/ },
+
+ { label: '鍒嗗樊灏忎簬', name: 'Fencha', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
+ { 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%' */ },
+
+
];
var _pageAdd = function () {
@@ -166,8 +235,19 @@
sendCity();
-
+
+ $(function () {
+ $("#PBSAreaId").parent().next().remove();
+ $("#PBSZhuanjia").parent().after("<br>");
+ $("#PBSDailiname").parent().next().remove();
+ $("#PBSfblx").parent().after("<br>");
+ $("#PBSNamesToubiao").parent().next().remove();
+ $("#PBSReasonname").parent().after("<br>");
+ $("#PBSCreater").parent().next().remove();
+ $("#PBSFenchadayu").parent().after("<br>");
+
+ });
</script>
}
--
Gitblit v1.9.1