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/CooperatecustomCustomer/Index.cshtml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index fe4b9cc..15af9c4 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -4,12 +4,14 @@
}
@section headerStyle{
<script type="text/javascript">
-
+
var khlxs = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.khlx))';
var khlys = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.khly))';
var hyfls = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.hyfl))';
var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
- var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
+ var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
+ var shifou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.shifou))';
+
loseherght = 60;
gridConfig = { multiselect: true, selectcol: "Id" };
dataCol = [
@@ -21,7 +23,7 @@
return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperatecustomCustomer/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
}
},
-
+ { label: '鑱旂郴鐢佃瘽', name: 'Tel', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
{ label: '瀹㈡埛鏉ユ簮', name: 'KhlyName', labtype: 'txt', hidden: false, width: 100 },
{ label: '琛屼笟鍒嗙被', name: 'HyflName', labtype: 'txt', hidden: false, width: 100 },
@@ -29,7 +31,7 @@
{ label: '涓氬姟缁忕悊', name: 'YwjlName', labtype: 'txt', hidden: false, width: 100 },
{ label: '璁㈠崟鏁伴噺', name: 'Ordercount', labtype: 'txt', hidden: false, width: 100 },
{ label: '璁㈠崟浜у��', name: 'Moneycount', labtype: 'txt', hidden: false, width: 100 },
-
+
];
dataUrl = "/CooperatecustomCustomer/GetList";
searchCol = [
@@ -44,7 +46,7 @@
{ label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '寤烘。鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
-
+ { label: '鏄惁鍔犲井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
];
var _pageAdd = function () {
--
Gitblit v1.9.1