From 45012c55d231a88bd17d3e6bc8c19a9940266d4e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:09:01 +0800
Subject: [PATCH] fix: 修正 客户分类复制页面 供应商分类复制页面 审核按钮禁用异常
---
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html | 148 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 138 insertions(+), 10 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 b0ca9f2..8914366 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"
@@ -238,7 +238,8 @@
var HInterID = $('#HInterID').val()
var HMaker = sessionStorage["HUserName"]
var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
- var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗锛�
+ var CloseType = 2 //鍏抽棴绫诲瀷锛�1鍏抽棴寮圭獥銆�2鍏抽棴椤电锛�
var option = {};
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
//#endregion
@@ -305,8 +306,20 @@
}
else if (OperationType == 2) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
+ CloseType = 1;
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
+ }
+ else if (OperationType == 3) { //澶嶅埗
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(HMaker);
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ OperationType = 1;
+ CloseType = 1;
+ CopyBill(HInterID);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -381,6 +394,91 @@
, "HPMTimes": result.data[i].HPMTimes
, "HAMTimes": result.data[i].HAMTimes
, 'HBaseTimes': result.data[i].HBaseTimes
+ , 'HBaseTimes_Sec': result.data[i].HBaseTimes_Sec
+ , 'HBaseDays': result.data[i].HBaseDays
+ , 'HOverTimes': result.data[i].HOverTimes
+ , 'HOverDays': result.data[i].HOverDays
+ , 'HLeaveTimes': result.data[i].HLeaveTimes
+ , 'HLeaveDays': result.data[i].HLeaveDays
+ , 'HLateQty': result.data[i].HLateQty
+ , 'HLateTimes': result.data[i].HLateTimes
+ , 'HEarlyQty': result.data[i].HEarlyQty
+ , 'HEarlyTimes': result.data[i].HEarlyTimes
+ , 'HOutForEmpQty': result.data[i].HOutForEmpQty
+ , 'HOutForEmpTimes': result.data[i].HOutForEmpTimes
+ , 'HOutForComQty': result.data[i].HOutForComQty
+ , 'HOutForComTimes': result.data[i].HOutForComTimes
+ , 'HAbsentDays': result.data[i].HAbsentDays
+ , 'HRestFlag': result.data[i].HRestFlag
+ , 'HSchClassID': result.data[i].HSchClassID
+ , 'HSchClassNumber': result.data[i].HSchClassNumber
+ , 'HSchClassName': result.data[i].HSchClassName
+ , 'HNeedTimes': result.data[i].HNeedTimes
+ , 'HCTPrjID': result.data[i].HCTPrjID
+ , 'HCTPrjNumber': result.data[i].HCTPrjNumber
+ , 'HCTPrjName': result.data[i].HCTPrjName
+ , 'HWorkTypeID': result.data[i].HWorkTypeID
+ , 'HWorkTypeNumber': result.data[i].HWorkTypeNumber
+ , 'HWorkTypeName': result.data[i].HWorkTypeName
+ , 'HPayMoney': result.data[i].HPayMoney
+ , 'HMoney': result.data[i].HMoney
+ , 'HRemark': result.data[i].HRemark
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 澶嶅埗妯″紡 椤甸潰鍒濆鍖�
+ function CopyBill(HInterID) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_WorkTimesBillController/GetPay_WorkTimesBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": data.HDeptID
+ , "HDeptName": data.閮ㄩ棬
+ , "HGroupID": data.HGroupID
+ , "HGroupName": data.鐝粍
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HStockOrgID": data.HStockOrgID
+ });
+ HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID;
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (let i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HEmpID": result.data[i].HEmpID
+ , "HEmpNumber": result.data[i].HEmpNumber
+ , "HEmpName": result.data[i].HEmpName
+ , "HEmpRate": result.data[i].HEmpRate
+ , "HPMTimes": result.data[i].HPMTimes
+ , "HAMTimes": result.data[i].HAMTimes
+ , 'HBaseTimes': result.data[i].HBaseTimes
+ , 'HBaseTimes_Sec': result.data[i].HBaseTimes_Sec
, 'HBaseDays': result.data[i].HBaseDays
, 'HOverTimes': result.data[i].HOverTimes
, 'HOverDays': result.data[i].HOverDays
@@ -438,7 +536,7 @@
, toolbar: '#toolbarDemo'
, totalRow: true
, limit: 500
- , height: 500
+ , height: 'full-250'
, loading: false
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
@@ -450,6 +548,7 @@
, { field: 'HAMTimes', title: '涓婂崍宸ユ椂', width: 100, edit: 'text', totalRow: true }
, { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', width: 100, edit: 'text', totalRow: true }
, { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes" }
+ , { field: 'HBaseTimes_Sec', title: '璁℃椂宸ユ椂', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes_Sec" }
, { field: 'HBaseDays', title: '鍩烘湰澶╂暟', width: 100, edit: 'text', totalRow: true }
, { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', width: 100, edit: 'text', totalRow: true }
, { field: 'HOverDays', title: '鍔犵彮澶╂暟', width: 100, edit: 'text', totalRow: true }
@@ -490,6 +589,7 @@
, "HPMTimes": "0"
, "HAMTimes": "0"
, "HBaseTimes": "0"
+ , "HBaseTimes_Sec": "0"
, "HBaseDays": "0"
, "HOverTimes": "0"
, "HOverDays": "0"
@@ -639,6 +739,7 @@
, "HPMTimes": "0"
, "HAMTimes": "0"
, "HBaseTimes": "0"
+ , "HBaseTimes_Sec": "0"
, "HBaseDays": "0"
, "HOverTimes": "0"
, "HOverDays": "0"
@@ -703,6 +804,7 @@
, "HPMTimes": "0"
, "HAMTimes": "0"
, "HBaseTimes": "0"
+ , "HBaseTimes_Sec": "0"
, "HBaseDays": "0"
, "HOverTimes": "0"
, "HOverDays": "0"
@@ -1041,7 +1143,8 @@
} else {
obj.del();
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.reload(option);
+ table.cache["mainTable"].splice(rowIndex, 1);
+ table.render(option);
layer.close(index);
}
});
@@ -1276,6 +1379,37 @@
CheckedSet_tableSub();
}
+ //璁℃椂宸ユ椂
+ if (obj.event == "HBaseTimes_Sec") {
+ var oldText = table.cache["mainTable"][rowIndex].HBaseTimes_Sec;
+ var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ option.data[rowIndex].HBaseTimes_Sec = oldText;
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+
+ layer.msg("鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ for (var i = rowIndex * 1; i < option.data.length; i++) {
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HBaseTimes_Sec = isNaN(value) ? 0 : value * 1; //璁℃椂宸ユ椂
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ option.data[i].HBaseTimes_Sec = HBaseTimes_Sec;
+ }
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+ }
+
obj.event = "";
return false;
}
@@ -1496,13 +1630,7 @@
//#region 閫�鍑�
form.on('submit(btn_Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- //鎿嶄綔绫诲瀷锛圤perationType=1鏂板銆丱perationType=2缂栬緫锛�
- if (OperationType == 2) {
- Pub_Close(1);
- }
- else {
- Pub_Close(2);
- }
+ Pub_Close(CloseType);
});
})
//#endregion
--
Gitblit v1.9.1