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/CooperOrder/Index.cshtml | 133 ++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 48 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
index 8ff8474..7271917 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
@@ -10,6 +10,8 @@
var Khlx = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Khlx))';
var HuifangStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.HuifangStatus))';
var PingjiaStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.PingjiaStatus))';
+ var ShouliStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShouliStatus))';
+
var pageEntities = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.pageEntities))';
var pageEntitiesJson = JSON.parse(pageEntities);
@@ -38,9 +40,9 @@
pingjiabool = false;
} else if (pageEntitiesJson[i].PageName == "浼樻儬") {
youhuibool = false;
- }
+ }
}
-
+ //gridConfig = { multiselect: true, selectcol: "Id" };
loseherght = 60;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -57,7 +59,18 @@
}
},
- { label: '璁㈠崟绫诲埆', name: 'OrderTypeName', labtype: 'txt', hidden: false, width: 100 },
+ {
+ label: '璁㈠崟绫诲埆', name: 'OrderTypeName', labtype: 'txt', hidden: false, width: 100,
+ formatter: function (cellvalue, options, rowObject) {
+ var OrderTypea = rowObject.OrderTypeName;
+ if (rowObject.OrderType1Name != null && rowObject.OrderType1Name != '') {
+ OrderTypea += '-' + rowObject.OrderType1Name;
+ }
+ if (rowObject.OrderType2 != null && rowObject.OrderType2 != '') {
+ OrderTypea += '-' + rowObject.OrderType2;
+ }
+ return OrderTypea;
+ } },
{ label: '瀹㈡埛鍚嶇О', name: 'KhdwName', labtype: 'txt', hidden: false, width: 200 },
{ label: '鏁伴噺', name: 'OrderNum', labtype: 'txt', hidden: false, width: 60 },
@@ -110,7 +123,7 @@
label: '閫佽揣', name: 'SonghuoStatusName', labtype: 'txt', hidden: songhuobool, width: 60,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.ShouliStatus == '5') {
- return "鈭�";
+ return "<a onclick=\"songhuo('" + rowObject.Id + "')\" >鈭�</a>";
} else {
if (rowObject.ShouliStatus == '1' || rowObject.ChedanStatus == 'A') {
return "";
@@ -132,12 +145,12 @@
}
} else {
- return "鈭�";
+ return "<a onclick=\"huifang('" + rowObject.Id + "')\" >鈭�</a>";
}
}
},
{
- label: '璇勪环', name: 'PingjiaStatusName', labtype: 'txt', hidden: pingjiabool, width: 60,
+ label: '璇勪环', name: 'PingjiaStatusName', labtype: 'txt', hidden: true, width: 60,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.PingjiaStatus == 'D') {
if (rowObject.ShouliStatus == '1') {
@@ -182,7 +195,7 @@
];
-
+
dataUrl = "/CooperOrder/GetList";
@@ -196,8 +209,8 @@
{ label: '鍥炶', name: 'HuifangStatus', labtype: 'combox', hidden: false, data: JSON.parse(HuifangStatus), cwidth: '5%', cccwidth: '8%' },
{ label: '璇勪环', name: 'PingjiaStatus', labtype: 'combox', hidden: false, data: JSON.parse(PingjiaStatus), cwidth: '5%', cccwidth: '8%' },
-
-
+ { label: '璁㈠崟鐘舵��', name: 'ShouliStatus', labtype: 'combox', hidden: false, data: JSON.parse(ShouliStatus), cwidth: '5%', cccwidth: '8%' },
+
@@ -230,7 +243,7 @@
global: false,
data: "",
success: function (data) {
-
+
if (data.Result) {
toastr.success("鍙楃悊鎴愬姛");
window._reloadPageData();
@@ -261,7 +274,7 @@
}
function huifang(id) {
- OpenWindow("鍥炶", "20%", "30%", "/CooperOrder/Huifang?id=" + id);
+ OpenWindow("鍥炶", "50%", "60%", "/CooperOrder/Huifang?id=" + id);
}
function pingjia(id) {
@@ -270,47 +283,47 @@
function songhuo(id) {
+ OpenWindow("閫佽揣", "50%", "60%", "/CooperOrder/Songhuo?id=" + id);
+ //// 1銆佹墦寮�寮瑰嚭灞�
+ //var index = layer.open({
+ // type: 1,銆�銆�//鍩烘湰灞傜被鍨�
+ // icon: 0, //鍥炬爣
+ // content: '纭閫佽揣锛�', //鍐呭
+ // shade: 0.3, //閬僵,濡傛灉鎯冲畾涔夊埆鐨勯鑹�,鍙互shade:[0.5,'#fff']
+ // shadeClose: 1, //鏄惁鐐瑰嚮閬僵鍏抽棴
+ // skin: 'demoClass', //鏍峰紡绫诲悕
+ // moveType: 1, //鎷栨嫿椋庢牸,榛樿涓�0(浼氭湁涓繃搴︾殑閫忔槑妗�)
+ // btn: ['纭畾', '鍙栨秷'], //鎸夐挳
+ // btn1: function () { //鎸夐挳涓�鐨勫洖璋�
- // 1銆佹墦寮�寮瑰嚭灞�
- var index = layer.open({
- type: 1,銆�銆�//鍩烘湰灞傜被鍨�
- icon: 0, //鍥炬爣
- content: '纭閫佽揣锛�', //鍐呭
- shade: 0.3, //閬僵,濡傛灉鎯冲畾涔夊埆鐨勯鑹�,鍙互shade:[0.5,'#fff']
- shadeClose: 1, //鏄惁鐐瑰嚮閬僵鍏抽棴
- skin: 'demoClass', //鏍峰紡绫诲悕
- moveType: 1, //鎷栨嫿椋庢牸,榛樿涓�0(浼氭湁涓繃搴︾殑閫忔槑妗�)
- btn: ['纭畾', '鍙栨秷'], //鎸夐挳
- btn1: function () { //鎸夐挳涓�鐨勫洖璋�
+ // layer.close(index);
- layer.close(index);
+ // $.ajax({
+ // type: "GET",
+ // url: "/CooperOrder/Songhuo?id=" + id,
+ // dataType: "json",
+ // global: false,
+ // data: "",
+ // success: function (data) {
- $.ajax({
- type: "GET",
- url: "/CooperOrder/Songhuo?id=" + id,
- dataType: "json",
- global: false,
- data: "",
- success: function (data) {
-
- if (data.Result) {
- toastr.success("閫佽揣鎴愬姛");
- window._reloadPageData();
- } else {
- toastr.error("閫佽揣澶辫触" + data.Message);
- }
- },
- error: function () {
+ // if (data.Result) {
+ // toastr.success("閫佽揣鎴愬姛");
+ // window._reloadPageData();
+ // } else {
+ // toastr.error("閫佽揣澶辫触" + data.Message);
+ // }
+ // },
+ // error: function () {
- toastr.error("閫佽揣澶辫触");
- }
- });
- },
- // btn2:function(){ //鎸夐挳浜岀殑鍥炶皟
- //
- // }
- });
+ // toastr.error("閫佽揣澶辫触");
+ // }
+ // });
+ // },
+ // // btn2:function(){ //鎸夐挳浜岀殑鍥炶皟
+ // //
+ // // }
+ //});
}
function wangong(id) {
@@ -336,7 +349,7 @@
global: false,
data: "",
success: function (data) {
-
+
if (data.Result) {
toastr.success("瀹屽伐鎴愬姛");
window._reloadPageData();
@@ -356,6 +369,30 @@
// }
});
}
+
+ var _pagePrint = function () {
+
+ var XdTime = $("#PBSXdTime").val();
+ var OrderNo = $("#PBSOrderNo").val();
+ var OrderType = $("#PBSOrderType").val();
+ var Ywjl = $("#PBSYwjl").val();
+ var KhdwName = $("#PBSKhdwName").val();
+
+
+ var Khlx = $("#PBSKhlx").val();
+ var HuifangStatus = $("#PBSHuifangStatus").val();
+ var PingjiaStatus = $("#PBSPingjiaStatus").val();
+
+
+
+ var url = "/CooperOrder/printList?XdTime=" + XdTime + "&OrderNo=" + OrderNo + "&OrderType=" + OrderType + "&Ywjl=" + Ywjl + "&KhdwName=" + KhdwName + "&Khlx=" + Khlx + "&HuifangStatus=" + HuifangStatus + "&PingjiaStatus=" + PingjiaStatus;
+ var me = window.open(url, "鎵撳嵃"); //鎵撳紑鏂扮獥鍙�
+
+
+ }
+
+
+
var _afterSave = function (result) {
if (result) {
toastr.success("淇濆瓨鎴愬姛");
--
Gitblit v1.9.1