From 82ba14eeb57b4e7ccc652afb0e700a89ce4e64f6 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 25 二月 2025 11:21:39 +0800
Subject: [PATCH] 增加斯莫尔 性能检测散点图报表，修改送测登记数据台账报表
---
WebTM/views/工资管理/加班申请/Pay_OverApplyBill.html | 87 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 26 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
index f8e1ee8..52cb458 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<!--<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鍔犵彮鐢宠鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -284,6 +286,14 @@
//妯″潡鍚�
var HModName = "Pay_OverApplyBill";
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "2209";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//琛ㄦ牸娓叉煋鍙傛暟
var option = {}; //瀛愯〃娓叉煋鍙傛暟
//鑾峰彇鍙傛暟
@@ -300,10 +310,6 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "../../user/login.html"; });
}
- //#endregion
-
- //#region 鍒濆鍖栬〃鏍�
- //DisPlay_HideColumn();
//#endregion
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
@@ -346,7 +352,7 @@
//#endregion
//#region 鍒濆鍖栬〃鏍�
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
//#endregion
//#endregion
@@ -503,7 +509,7 @@
var HTimes = (hours * 1 + minutes / 60).toFixed(2); //鍔犵彮鏃堕棿
//璁剧疆琛屾暟鎹�
data["HTimes"] = HTimes;
- if (data["HRelTimes"] == true) {
+ if (data["HRestFlag"] == true) {
data["HRelTimes"] = HTimes - data["HRestTimes"];
} else {
data["HRelTimes"] = HTimes;
@@ -539,7 +545,7 @@
var HRelPay = (HTimes * HPayMoney).toFixed(2); //搴斾粯宸ヨ祫 = 瀹為檯瀹為檯*灏忔椂宸ヨ祫
//璁剧疆琛屾暟鎹�
data["HTimes"] = HTimes;
- if (data["HRelTimes"] == true) {
+ if (data["HRestFlag"] == true) {
data["HRelTimes"] = HTimes - data["HRestTimes"];
} else {
data["HRelTimes"] = HTimes;
@@ -665,18 +671,18 @@
, cellMinWidth: 120
, height: 400
, cols: [[
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ { type: 'checkbox', totalRowText: '鍚堣' }
, { type: 'numbers', title: '搴忓彿' }
- , { field: 'RowID', title: '琛屽彿' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HEmpID', title: '鑱屽憳ID' }
+ , { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+ , { field: 'HEmpID', title: '鑱屽憳ID', hide:true, style: 'background-color: #f9f9f9;' }
, { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', edit: 'text', event: "HEmpNumber" } //f7
- , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', style: 'background-color: #CDCDCD;' }
+ , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes" }
, { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes" }
, { field: 'HRestFlag', title: '鍗堜紤鏍囪', templet: "#HRestFlag" }
- , { field: 'HRestTimes', title: '鍗堜紤鏃堕棿', edit: 'text'} //f7
- , { field: 'HTimes', title: '鍔犵彮鏃堕棿', style: 'background-color: #CDCDCD;'} //f7
- , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', style: 'background-color: #CDCDCD;' } //f7
+ , { field: 'HRestTimes', title: '鍗堜紤鏃堕棿', edit: 'text', totalRow: true} //f7
+ , { field: 'HTimes', title: '鍔犵彮鏃堕棿', style: 'background-color: #f9f9f9;', totalRow: true} //f7
+ , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', style: 'background-color: #f9f9f9;', totalRow: true } //f7
, { field: 'HRemark', title: '澶囨敞', edit: 'text' } //f7
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -713,7 +719,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroupID", "yes"]
+ , content: ["../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -747,7 +753,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -759,7 +765,7 @@
}
$("#HDeptID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HDeptName").val(checkStatus.data[0].HName);//鍚嶇О
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -778,7 +784,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -790,7 +796,7 @@
}
$("#HMangerID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HMangerName").val(checkStatus.data[0].HName);//鍚嶇О
+ $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -899,6 +905,8 @@
option.data = tableSub;
for (var i = 0; i < option.data.length; i++) {
option.data[i]["RowID"] = (i + 1) * 10;
+ option.data[i]["HBTimes"] = option.data[i]["HBTimes"].split("T")[0] + " " + option.data[i]["HBTimes"].split("T")[1];
+ option.data[i]["HETimes"] = option.data[i]["HETimes"].split("T")[0] + " " + option.data[i]["HETimes"].split("T")[1];
}
table.render(option);
CheckedSet_tableSub();
@@ -1102,7 +1110,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1115,10 +1123,17 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].HNumber
- , "HEmpName": checkStatus.data[0].HName
+ , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
+ , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ obj.update({
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
+ })
}
})
}
@@ -1192,9 +1207,9 @@
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] += "font-size:100%";
}
//璁剧疆鍒楀
//if (data1.data[0].HColumnWidth != 0) {
@@ -1268,8 +1283,28 @@
});
-
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ $("#HDeptID").val(obj[0].HDeptID);//閮ㄩ棬浠ｇ爜
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+ }
+ function GetHManagerValue(obj) //杩斿洖涓荤
+ {
+ $("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HMangerID").val(obj[0].HItemID);
+ }
+ function GetHEmpListValue(data) //杩斿洖鑱屽憳
+ {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1