From 295f6bfa5526f20e24f2ad8baf51bcc876bf512a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 12 七月 2022 16:20:35 +0800
Subject: [PATCH] nothing
---
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit_yqn.html | 49 ++++++++++++++++++++++--
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList_yqn.html | 25 +++++++-----
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html | 1
3 files changed, 60 insertions(+), 15 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 5654ede..23f3bfb 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -101,6 +101,7 @@
, { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
, { field: 'HNumber', width: 150, title: '鑱屽憳浠ｇ爜' }
, { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
+ , { field: 'HEmpRate', width: 150, title: '鑱屽憳绯绘暟', sort: true }
]]
, page: true
});
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit_yqn.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit_yqn.html"
index 8737688..72b52d1 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit_yqn.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit_yqn.html"
@@ -412,6 +412,10 @@
HEmpName: checkStatus.data[0].HName
, HEmpID: checkStatus.data[0].HItemID
, HEmpNumber: checkStatus.data[0].HNumber
+ , HEmpRate: checkStatus.data[0].HEmpRate
+ , HPMTimes: 0
+ , HAMTimes: 0
+ , HMoney: 0
});
layer.close(layer.index);
}
@@ -487,25 +491,59 @@
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
switch (field) {
- case "HPMTimes": //涓嬪崍宸ユ椂
+ case "HEmpRate": //鑱屽憳绯绘暟
value = isNaN(value) ? 0 : value;
+ var HAvgMoney = $("#HAvgMoney").val();//骞冲潎宸ヨ祫
+ var HEmpRate = value;
+ var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //宸ヤ綔宸ユ椂
+ var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //鏍囧噯宸ユ椂
+
+ var HMoney;
+ if (HAMTimes == 0)
+ HMoney = 0;
+ else
+ HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HEmpRate: value, //涓嬪崍宸ユ椂
+ HMoney: HMoney, //
+ });
+ break;
+ case "HPMTimes": //宸ヤ綔宸ユ椂
+ value = isNaN(value) ? 0 : value;
+ var HAvgMoney = $("#HAvgMoney").val();//骞冲潎宸ヨ祫
+ var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
+ var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //鏍囧噯宸ユ椂
+ var HPMTimes = value;//骞冲潎宸ヨ祫
//鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
var HBaseTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes) + Number(value);
//宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
- var HMoney = Number(isNaN(data.HPayMoney) ? 0 : data.HPayMoney) * HBaseTimes;
+ var HMoney;
+ if (HAMTimes == 0)
+ HMoney = 0;
+ else
+ HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HPMTimes: value, //涓嬪崍宸ユ椂
HBaseTimes: HBaseTimes, //鍩烘湰宸ユ椂
- HMoney: HMoney, //宸ヨ祫
+ HMoney: HMoney, //
});
break;
- case "HAMTimes": //涓婂崍宸ユ椂
+ case "HAMTimes": //鏍囧噯宸ユ椂
value = isNaN(value) ? 0 : value;
+ var HAvgMoney = $("#HAvgMoney").val();//骞冲潎宸ヨ祫
+ var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
+ var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //宸ヤ綔宸ユ椂
+ var HAMTimes = value; //宸ヤ綔宸ユ椂
//鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
var HBaseTimes = Number(value) + Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes);
//宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
- var HMoney = Number(isNaN(data.HPayMoney) ? 0 : data.HPayMoney) * HBaseTimes;
+ var HMoney;
+ if (value == 0)
+ HMoney = 0;
+ else
+ HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HAMTimes: value, //涓婂崍宸ユ椂
@@ -575,6 +613,7 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡
, "HUpDateDate": data.淇敼鏃ユ湡
, "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HAvgMoney": data.HAvgMoney
});
} else {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList_yqn.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList_yqn.html"
index a3aad4e..ee73e76 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList_yqn.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList_yqn.html"
@@ -149,19 +149,24 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
+ , { field: 'HAvgMoney', title: '骞冲潎宸ヨ祫', width: 120 }
+ //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
+ //, { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
+ //, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 125 }
+ //, { field: '鐝粍', title: '鐝粍', width: 125 }
+ //, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+ //, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 180 }
+ //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+ //, { field: '鎽樿', title: '鎽樿', width: 125 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
, { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 180 }
, { field: 'HEmpName', title: '鑱屽憳', width: 125 }
- //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
- , { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
- , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 125 }
- , { field: '鐝粍', title: '鐝粍', width: 125 }
- , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 180 }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
- , { field: '鎽樿', title: '鎽樿', width: 125 }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
+ , { field: '鑱屽憳绯绘暟', title: '鑱屽憳绯绘暟', width: 100 }
+ , { field: '涓嬪崍', title: '宸ヤ綔宸ユ椂', width: 100 }
+ , { field: '涓婂崍', title: '鏍囧噯宸ユ椂', width: 100 }
+ , { field: 'HMoney', title: '宸ヨ祫', width: 100 }
+ //, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
--
Gitblit v1.9.1