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_ErrWorkTimesRequestBill.html | 145 ++++++++++++++++++++++++++++++++----------------
1 files changed, 97 insertions(+), 48 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
index aa2bc98..487357a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
@@ -154,7 +154,7 @@
</div>
</div>
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О<label style="color:red"> </label></label>
<div class="layui-input-block" style="margin-left: 77px; width: 270px;">
<input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color: #efefef4d; width: 180px; display: inline-block;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -164,7 +164,7 @@
</div>
</div>
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁￠噺鍗曚綅<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁￠噺鍗曚綅<label style="color:red"> </label></label>
<div class="layui-input-block" style="margin-left: 77px; width: 270px;">
<input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color: #efefef4d; width: 180px; display: inline-block;" readonly>
<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
@@ -727,7 +727,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
//, page: true
- //, limit: 500
+ , limit: 50
//, limits: [50, 500, 5000, 50000]
, totalRow: true
, cellMinWidth: 120
@@ -740,9 +740,9 @@
, { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', edit: 'text', event: "HEmpNumber" } //f7
, { field: 'HEmpName', title: '鑱屽憳鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HWorkTypeID', title: '宸ョID', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HWorkTypeNumber', title: '宸ョ浠ｇ爜', style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HWorkTypeNumber', title: '宸ョ浠ｇ爜', edit: 'text', event: "HWorkTypeNumber" } //f7
, { field: 'HWorkTypeName', title: '宸ョ鍚嶇О', style: 'background-color: #f9f9f9;' }
- , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', style: 'background-color: #f9f9f9;' }
+ , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', edit: 'text' }
, { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes", hide: true }
, { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes", hide: true }
, { field: 'HTimes', title: '鍔犵彮鏃堕棿', totalRow: true, edit: 'text', totalRow: true }
@@ -1180,7 +1180,7 @@
var value1_ = ["灏忔椂宸ヨ祫", "鍔犵彮鏃堕棿", "瀹為檯鏃堕棿", "搴斿彂宸ヨ祫"]; ////瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗曞搴旂殑鍒楀悕娓呭崟
var value2 = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗�
var value2_ = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
- var value3 = ["HEmpID", "HWorkTypeID"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
+ var value3 = ["HEmpID"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
var value3_ = ["鑱屽憳", "宸ョ"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
@@ -1201,14 +1201,14 @@
layer.msg("閮ㄩ棬鏈�夋嫨!");
return false;
}
- if ($("#HMaterID").val() == "0") {
- layer.msg("鐗╂枡鏈�夋嫨!");
- return false;
- }
- if ($("#HUnitID").val() == "0") {
- layer.msg("璁￠噺鍗曚綅鏈�夋嫨!");
- return false;
- }
+ //if ($("#HMaterID").val() == "0") {
+ // layer.msg("鐗╂枡鏈�夋嫨!");
+ // return false;
+ //}
+ //if ($("#HUnitID").val() == "0") {
+ // layer.msg("璁￠噺鍗曚綅鏈�夋嫨!");
+ // return false;
+ //}
temp = $("#HSumRequestTimes").val();
if (temp == "") {
layer.msg("棰勮宸ユ椂涓嶈兘涓虹┖!");
@@ -1217,14 +1217,14 @@
layer.msg("棰勮宸ユ椂璇疯緭鍏ラ潪璐熸暟!");
return false;
}
- temp = $("#HPlanQty").val();
- if (temp == "") {
- layer.msg("璁″垝鏁伴噺涓嶈兘涓虹┖!");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("棰勮鏁伴噺璇疯緭鍏ラ潪璐熸暟!");
- return false;
- }
+ //temp = $("#HPlanQty").val();
+ //if (temp == "") {
+ // layer.msg("璁″垝鏁伴噺涓嶈兘涓虹┖!");
+ // return false;
+ //} else if (!ref.test(temp)) {
+ // layer.msg("棰勮鏁伴噺璇疯緭鍏ラ潪璐熸暟!");
+ // return false;
+ //}
//#endregion
//#region 瀛愯〃鏁版嵁妫�楠�
@@ -1264,10 +1264,10 @@
//鐗规畩鏍￠獙
temp = option.data[i]["HTimes"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛�:鍔犵彮鏃堕棿涓嶈兘涓�0!");
- return false;
- }
+ //if (temp == "0") {
+ // layer.msg("绗�" + (i + 1) + "琛�:鍔犵彮鏃堕棿涓嶈兘涓�0!");
+ // return false;
+ //}
temp = option.data[i]["HRelTimes"] + "";
if (temp == "0") {
layer.msg("绗�" + (i + 1) + "琛�:瀹為檯鏃堕棿涓嶈兘涓�0!");
@@ -1276,6 +1276,11 @@
temp = option.data[i]["HRelPay"] + "";
if (temp == "0") {
layer.msg("绗�" + (i + 1) + "琛�:搴斾粯宸ヨ祫涓嶈兘涓�0!");
+ return false;
+ }
+ temp = option.data[i]["HPayMoney"] + "";
+ if (temp == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:灏忔椂宸ヨ祫涓嶈兘涓�0!");
return false;
}
if (option.data[i]["HRelTimes"] * option.data[i]["HPayMoney"] != option.data[i]["HRelPay"] * 1) {
@@ -1382,7 +1387,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1392,8 +1397,16 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
-
- var HEmpID = checkStatus.data[0].HItemID;
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ var HEmpID = OptionData.HItemID;
+ obj.update({
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
+ })
$.ajax({
url: GetWEBURL() + "HR_EmpDimissionBill/getInfoByHEmpID",
type: "GET",
@@ -1402,9 +1415,6 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var HEmpID = checkStatus.data[0].HItemID;
- var HEmpNumber = checkStatus.data[0].鑱屽憳浠ｇ爜;
- var HEmpName = checkStatus.data[0].鑱屽憳鍚嶇О;
var HWorkTypeID = result.data[0]["HWorkTypeID"];
var HWorkTypeNumber = result.data[0]["HWorkTypeNumber"];
var HWorkTypeName = result.data[0]["HWorkTypeName"];
@@ -1422,9 +1432,9 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].HNumber
- , "HEmpName": checkStatus.data[0].HName
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
, "HWorkTypeID": HWorkTypeID
, "HWorkTypeNumber": HWorkTypeNumber
, "HWorkTypeName": HWorkTypeName
@@ -1438,7 +1448,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1453,7 +1462,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../宸ヨ祫绠＄悊/Gy_WorkTypeBillList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html?Type=HWorkTypeList", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1463,7 +1472,11 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
//璁＄畻鍔犵彮鏃堕棿鍜屽疄闄呮椂闂�
var data = obj.data;
var HBTimes = data["HBTimes"]; //寮�濮嬫椂闂�
@@ -1475,20 +1488,16 @@
var minutes = parseInt((time / (1000 * 60))) % 60; //鐩稿樊鍒嗛挓鏁�
var HTimes = (hours * 1 + minutes / 60).toFixed(2); //鍔犵彮鏃堕棿
var HRelTimes = data["HRelTimes"];
- var HPayMoney = checkStatus.data[0].灏忔椂宸ヨ祫;
+ var HPayMoney = OptionData.灏忔椂宸ヨ祫;
var HRelPay = (HRelTimes * HPayMoney).toFixed(2); //搴斾粯宸ヨ祫 = 瀹為檯鏃堕棿*灏忔椂宸ヨ祫
-
-
-
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HWorkTypeID": checkStatus.data[0].HItemID
- , "HWorkTypeNumber": checkStatus.data[0].宸ョ浠ｇ爜
- , "HWorkTypeName": checkStatus.data[0].宸ョ鍚嶇О
- , "HPayMoney": checkStatus.data[0].灏忔椂宸ヨ祫
+ "HWorkTypeID": OptionData.HItemID
+ , "HWorkTypeNumber": OptionData.宸ョ浠ｇ爜
+ , "HWorkTypeName": OptionData.宸ョ鍚嶇О
+ , "HPayMoney": OptionData.灏忔椂宸ヨ祫
, "HRelPay": HRelPay
})
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1623,8 +1632,48 @@
});
-
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ 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 GetGyMaterial(obj) //杩斿洖鐗╂枡
+ {
+ $("#HMaterID").val(obj.HItemID);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(obj.瑙勬牸鍨嬪彿);
+ $("#HUnitID").val(obj.HUnitID);
+ $("#HUnitNumber").val(obj.璁￠噺鍗曚綅浠ｇ爜);
+ $("#HUnitName").val(obj.璁￠噺鍗曚綅鍚嶇О);
+ }
+ function GetUnitValue(obj) //杩斿洖璁￠噺鍗曚綅
+ {
+ $("#HUnitID").val(obj[0].HItemID);
+ $("#HUnitNumber").val(obj[0].璁￠噺鍗曚綅浠ｇ爜);
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ }
+ function GetHEmpListValue(data) //杩斿洖鑱屽憳
+ {
+ OptionData = data
+ }
+ function GetHWorkTypeListValue(data) //杩斿洖宸ョ
+ {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1