From 3425237a2b54ca28fc3e3c5f7c35a7fbef4e15fa Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:19:29 +0800
Subject: [PATCH] 1
---
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
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.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.html"
index 7c8766e..2791991 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.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.html"
@@ -536,7 +536,7 @@
, toolbar: '#toolbarDemo'
, totalRow: true
, limit: 500
- , height: 500
+ , height: 'full-250'
, loading: false
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
@@ -574,8 +574,8 @@
, { field: 'HWorkTypeID', title: 'HWorkTypeID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HWorkTypeNumber', title: '宸ョ浠ｇ爜', width: 100, edit: 'text', event: "HWorkTypeNumber" } //F7
, { field: 'HWorkTypeName', title: '宸ョ鍚嶇О', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', width: 100, edit: 'text' }
- , { field: 'HMoney', title: '宸ヨ祫', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', width: 100 }
+ , { field: 'HMoney', title: '宸ヨ祫', width: 100,totalRow: true }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
@@ -705,6 +705,7 @@
layer.confirm('鍒楄〃涓凡缁忓瓨鍦ㄨ亴鍛�,鏄惁瑕佽鐩栵紵', { icon: 3, title: '鎻愮ず' }, function (index) {
set_InitGrid(); //鍒濆鍖栧瓙琛�
GetEmployee(); //鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
+ DisPlay_HideColumn();//鍒楄缃�
layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
});
}
@@ -1045,6 +1046,10 @@
if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
option.cols[0][i + 1]["hide"] = false;
}
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
@@ -1287,12 +1292,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ console.log(obj.data["HBaseTimes"]);
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HWorkTypeID": OptionData.HItemID
, "HWorkTypeNumber": OptionData.宸ョ浠ｇ爜
, "HWorkTypeName": OptionData.宸ョ鍚嶇О
, "HPayMoney": OptionData.灏忔椂宸ヨ祫
+ , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : (obj.data["HBaseTimes"]) * OptionData.灏忔椂宸ヨ祫).toFixed(4)
})
}
})
@@ -1520,8 +1527,8 @@
var HAMTimes = HBaseTimes / 2; //涓婂崍宸ユ椂
var HPMTimes = HBaseTimes / 2; //涓嬪崍宸ユ椂
var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
- var HMoney = HPayMoney * HBaseTimes; //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
-
+ var HMoney = (HPayMoney * HBaseTimes).toFixed(4); //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+ debugger
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HBaseTimes: HBaseTimes
--
Gitblit v1.9.1