From ebef191888d9d2c2a2e7a7f677189164e4eef0b3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 八月 2025 19:04:33 +0800
Subject: [PATCH] 车间委外接收单列表bug处理
---
WebTM/views/工资管理/工资单/Pay_PayMentBill.html | 144 +++++++++++++++++++++++++++++------------------
1 files changed, 88 insertions(+), 56 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.html"
index 5387a37..cc79aad 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.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>
@@ -278,6 +280,14 @@
//妯″潡鍚�
var HModName = "Pay_PayMentBill";
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "2202";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//琛ㄦ牸娓叉煋鍙傛暟
var option = {}; //瀛愯〃娓叉煋鍙傛暟
//鑾峰彇鍙傛暟
@@ -539,29 +549,29 @@
, cellMinWidth: 120
, height: 400
, cols: [[
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ { type: 'checkbox', totalRowText: '鍚堣' }
, { type: 'numbers', title: '搴忓彿' }
, { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
, { field: 'HEmpID', title: '鑱屽憳ID', hide: true }
- , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', event: "HEmpNumber" } //f7
+ , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', edit: 'text', event: "HEmpNumber" } //f7
, { field: 'HEmpName', title: '鑱屽憳鍚嶇О' }
, { field: 'HEmpType', title: '宸ヨ祫绫诲瀷' }
- , { field: 'HPostID', title: '宀椾綅ID', hide: true }
- , { field: 'HPostNumber', title: '宀椾綅浠ｇ爜' }
+ , { field: 'HPostID', title: '宀椾綅ID', hide: true }
+ , { field: 'HPostNumber', title: '宀椾綅浠ｇ爜'}
, { field: 'HPostName', title: '宀椾綅鍚嶇О' }
- , { field: 'HPiecePay', title: '璁′欢宸ヨ祫' }
- , { field: 'HTimesPay', title: '璁℃椂宸ヨ祫', event: "HTimesPay" }
- , { field: 'HFixPay', title: '鍥哄畾宸ヨ祫' }
- , { field: 'HBasePay', title: '鍩虹宸ヨ祫' }
+ , { field: 'HPiecePay', title: '璁′欢宸ヨ祫', totalRow: true }
+ , { field: 'HTimesPay', title: '璁℃椂宸ヨ祫', event: "HTimesPay", totalRow: true }
+ , { field: 'HFixPay', title: '鍥哄畾宸ヨ祫', totalRow: true }
+ , { field: 'HBasePay', title: '鍩虹宸ヨ祫', totalRow: true }
, { field: 'HWorkTimes', title: '涓婄彮鏃堕棿' }
- , { field: 'HPayTotal', title: '宸ヨ祫灏忚' }
- , { field: 'HSubsidyTotal', title: '琛ヨ创鍚堣' }
- , { field: 'HDeuctTotal', title: '鎵ｆ灏忚' }
- , { field: 'HShoudPay', title: '搴斿彂宸ヨ祫' }
- , { field: 'HInsurance', title: '鎵ｇぞ淇�' }
- , { field: 'HTaxBefore', title: '绋庡墠' }
+ , { field: 'HPayTotal', title: '宸ヨ祫灏忚', totalRow: true }
+ , { field: 'HSubsidyTotal', title: '琛ヨ创鍚堣', totalRow: true }
+ , { field: 'HDeuctTotal', title: '鎵ｆ灏忚', totalRow: true }
+ , { field: 'HShoudPay', title: '搴斿彂宸ヨ祫', totalRow: true }
+ , { field: 'HInsurance', title: '鎵ｇぞ淇�', totalRow: true }
+ , { field: 'HTaxBefore', title: '绋庡墠', totalRow: true }
, { field: 'HTax', title: '绋�' }
- , { field: 'HRelPay', title: '瀹炲彂鍚堣' }
+ , { field: 'HRelPay', title: '瀹炲彂鍚堣', totalRow: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -609,7 +619,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -655,7 +665,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -667,7 +677,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) { }
@@ -961,7 +971,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -971,14 +981,21 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].HNumber
- , "HEmpName": checkStatus.data[0].HName
- })
+ OptionData = checkStatus.data[0];
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
+ , "HPostID": OptionData.HPostID
+ , "HPostNumber": OptionData.宀椾綅浠ｇ爜
+ , "HPostName": OptionData.宀椾綅鍚嶇О
+ })
+ }
+
})
}
obj.event = "";
@@ -994,36 +1011,36 @@
function openDetailTouchedByDblclick(obj) {
$(document).off('dblclick', ".layui-table").on('dblclick', '.layui-table', function (e) {
//鑱屽憳
- if (obj.event == "HTimesPay") {
- //鎵撳紑鑱屽憳灏忕獥浣�
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鑱屽憳鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ //if (obj.event == "HTimesPay") {
+ // //鎵撳紑鑱屽憳灏忕獥浣�
+ // layer.open({
+ // type: 2
+ // , skin: "layui-layer-rim" //鍔犱笂杈规
+ // , title: "鑱屽憳鍒楄〃" //鏍囬
+ // , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ // , shift: 2 //寮瑰嚭鍔ㄧ敾
+ // , area: ["90%", "90%"] //绐椾綋澶у皬
+ // , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ // , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ // , btn: ["纭畾", "鍙栨秷"]
+ // , btn1: function (index, laero) {
+ // //鎸夐挳涓� 鐨勫洖璋�
+ // var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].HNumber
- , "HEmpName": checkStatus.data[0].HName
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
+ // if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ // }
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HEmpID": checkStatus.data[0].HItemID
+ // , "HEmpNumber": checkStatus.data[0].HNumber
+ // , "HEmpName": checkStatus.data[0].HName
+ // })
+ // layer.close(index);//鍏抽棴寮圭獥
+ // }
+ // })
+ //}
obj.event = "";
return false;
})
@@ -1267,8 +1284,23 @@
//#endregion
});
-
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ 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 GetHEmpListValue(data) //杩斿洖鑱屽憳
+ {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1