From c583582e0f78a7d5aad5b88c1ae368fb78143e61 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 01 七月 2024 14:30:36 +0800
Subject: [PATCH] 工资管理添加双击返回
---
WebTM/views/工资管理/加班申请/Pay_OverApplyBill.html | 35 ++
WebTM/views/生产管理/生产退库单/Sc_ProductionReturnList.html | 10
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillEdit.html | 90 +++++--
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html | 90 ++++++--
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList.html | 9
WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html | 10
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 138 ++++++++----
WebTM/views/工资管理/工资单/Pay_PayMentBill.html | 45 ++-
WebTM/views/工资管理/请假申请/Pay_OutApplyBill.html | 37 ++
WebTM/views/工资管理/Gy_DuSubsidyItemBillList.html | 10
WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBill.html | 63 ++++-
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html | 10
WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBill.html | 54 +++-
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html | 41 ++-
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html | 2
15 files changed, 475 insertions(+), 169 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index 93f9755..ef48073 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -357,7 +357,15 @@
$('#HEndDate').prop('disabled', false);
}
});
-
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHMoveStockBillValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index 2652ac7..bcd1923 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
@@ -282,6 +282,16 @@
}
//#endregion
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHProductInBillValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
index a11c2cd..dad97d8 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
@@ -203,7 +203,15 @@
});
})
//#endregion
-
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHDuSubsidyItemBillValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
//鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
index 87534a9..52cb458 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
@@ -719,7 +719,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1110,7 +1110,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1127,6 +1127,13 @@
, "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ obj.update({
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
+ })
}
})
}
@@ -1276,8 +1283,28 @@
});
-
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ 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 GetHEmpListValue(data) //杩斿洖鑱屽憳
+ {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
index 3bf8201..09f2eb8 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
@@ -1069,8 +1069,11 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
//鑾峰彇宸ヤ环
- var HMaterID = checkStatus.data[0].HItemID;
+ var HMaterID = OptionData.HItemID;
var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
var HOldPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);
@@ -1092,7 +1095,6 @@
, "HMaterModel": OptionData.瑙勬牸鍨嬪彿
})
}
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1118,28 +1120,30 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
//鑾峰彇宸ヤ环
var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
- var HProcID = checkStatus.data[0].HItemID;
+ var HProcID = OptionData.HItemID;
var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
var HOldPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
if (HOldPrice != -1) {
obj.update({
- "HProcID": checkStatus.data[0].HItemID
- , "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
+ "HProcID": OptionData.HItemID
+ , "HProcNumber": OptionData.宸ュ簭浠ｇ爜
+ , "HProcName": OptionData.宸ュ簭鍚嶇О
, "HOldPrice": HOldPrice
})
} else {
obj.update({
- "HProcID": checkStatus.data[0].HItemID
- , "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
+ "HProcID": OptionData.HItemID
+ , "HProcNumber": OptionData.宸ュ簭浠ｇ爜
+ , "HProcName": OptionData.宸ュ簭鍚嶇О
})
}
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1164,28 +1168,31 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
//鑾峰彇宸ヤ环
var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
- var HSourceID = checkStatus.data[0].HItemID;
+ var HSourceID = OptionData.HItemID;
var HOldPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
if (HOldPrice != -1) {
obj.update({
- "HSourceID": checkStatus.data[0].HItemID
- , "HSourceNumber": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
- , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ "HSourceID": OptionData.HItemID
+ , "HSourceNumber": OptionData.鐢熶骇璧勬簮浠ｇ爜
+ , "HSourceName": OptionData.鐢熶骇璧勬簮鍚嶇О
, "HOldPrice": HOldPrice
})
} else {
obj.update({
- "HSourceID": checkStatus.data[0].HItemID
- , "HSourceNumber": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
- , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ "HSourceID": OptionData.HItemID
+ , "HSourceNumber": OptionData.鐢熶骇璧勬簮浠ｇ爜
+ , "HSourceName": OptionData.鐢熶骇璧勬簮鍚嶇О
})
}
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1364,7 +1371,25 @@
//#endregion
});
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 鍒楄〃
+ function GetGyMaterial(data) //杩斿洖鐗╂枡
+ {
+ OptionData = data
+ }
+ function GetProcessValue(data) //杩斿洖宸ュ簭
+ {
+ OptionData = data[0]
+ }
+ function GetGySource(data) //杩斿洖鐢熶骇璧勬簮
+ {
+ OptionData = data[0]
+ }
</script>
</body>
</html>
\ No newline at end of file
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 e918160..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"
@@ -619,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -971,7 +971,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -981,17 +981,21 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
- , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
- , "HPostID": checkStatus.data[0].HPostID
- , "HPostNumber": checkStatus.data[0].宀椾綅浠ｇ爜
- , "HPostName": checkStatus.data[0].宀椾綅鍚嶇О
- })
+ 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 = "";
@@ -1280,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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
index 8c58275..b20275b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
@@ -797,7 +797,7 @@
}
//杩斿洖婧愬崟淇℃伅
- function GetSourceBillList(result) {
+ window.GetSourceBillList = function (result) {
//杩斿洖琛ㄥご淇℃伅
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HDeptID": result.data[0].HDeptID == null ? 0 : result.data[0].HDeptID
@@ -805,7 +805,10 @@
, "HGroupID": result.data[0].HGroupID == null ? 0 : result.data[0].HGroupID
, "HGroupName": result.data[0].鐝粍
});
-
+ $("#HMainSourceInterID").val(result.data[0].hmainid);
+ $("#HMainSourceEntryID").val(result.data[0].hsubid);
+ $("#HMainSourceBillType").val(result.data[0].HBillType);
+ $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
@@ -1344,12 +1347,7 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
OptionData = checkStatus.data[0];
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
- , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
- })
+
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
@@ -1745,6 +1743,7 @@
layer.msg(data.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
@@ -1874,18 +1873,38 @@
$("#HPayTypeName").val(obj[0].宸ヨ祫绫诲瀷鍚嶇О);
$("#HPayType").val(obj[0].HItemID);
}
+ function GetHProductInBillValue(obj) { //杩斿洖鐢熶骇鍏ュ簱鍗�
+ var objData = {};
+ objData.data = obj;
+ GetSourceBillList(objData);
+ }
+ function GetHProductionRerurnValue(obj) { //杩斿洖鐢熶骇閫�搴撳崟
+ var objData = {};
+ objData.data = obj;
+ GetSourceBillList(objData);
+ }
+ function GetHMoveStockBillValue(obj) { //杩斿洖鐩存帴璋冩嫧鍗�
+ var objData = {};
+ objData.data = obj;
+ GetSourceBillList(objData);
+ }
+ function GetHProcessReportValue(obj) { //杩斿洖宸ュ簭姹囨姤鍗�
+ var objData = {};
+ objData.data = obj;
+ GetSourceBillList(objData);
+ }
//鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 鍒楄〃
- function GetMaterValue(data) //杩斿洖鐗╂枡
+ function GetGyMaterial(data) //杩斿洖鐗╂枡
{
OptionData = data
}
function GetProcessValue(data) //杩斿洖宸ュ簭
{
- OptionData = data
+ OptionData = data[0]
}
function GetGySource(data) //杩斿洖鐢熶骇璧勬簮
{
- OptionData = data
+ OptionData = data[0]
}
function GetHEmpListValue(data) //杩斿洖鑱屽憳
{
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
index cb93a4e..4ee97c7 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
@@ -515,12 +515,19 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
OptionData = checkStatus.data[0];
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "HMaterNumber": checkStatus.data[0].鐗╂枡浠ｇ爜
- , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
+ "HMaterID": OptionData.HItemID
+ , "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterModel": OptionData.瑙勬牸鍨嬪彿
, "HQty": 1 //瀹炴敹鏁伴噺
, "HMoney": 0 //閲戦
});
@@ -538,7 +545,7 @@
} else {
obj.update({
"HPrice": result.data[0].鍗曚环
- ,"HMoney": obj.data.HQty * result.data[0].鍗曚环
+ , "HMoney": obj.data.HQty * result.data[0].鍗曚环
});
}
}
@@ -546,14 +553,6 @@
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
}
});
}
@@ -577,12 +576,17 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- obj.update({
- HProcName: checkStatus.data[0].宸ュ簭鍚嶇О
- , HProcID: checkStatus.data[0].HItemID
- , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
- });
OptionData = checkStatus.data[0];
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+ obj.update({
+ "HProcID": OptionData.HItemID
+ , "HProcNumber": OptionData.宸ュ簭浠ｇ爜
+ , "HProcName": OptionData.宸ュ簭鍚嶇О
+ })
$.ajax({
url: GetWEBURL() + "Pay_OtherBalBill/getOtherBalBillPrice",
type: "GET",
@@ -605,16 +609,6 @@
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
- layer.close(layer.index);
- }
- , btn2: function (index, layero) {
- },
- end: function () {
- obj.update({
- "HProcID": OptionData.HItemID
- , "HProcNumber": OptionData.宸ュ簭浠ｇ爜
- , "HProcName": OptionData.宸ュ簭鍚嶇О
- })
}
});
}
@@ -792,7 +786,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1164,8 +1158,42 @@
return Result;
}
-
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ 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 GetHEmpValue(obj) //杩斿洖鑱屽憳
+ {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ function GetHWorkPayTypeValue(obj) //杩斿洖宸ヨ祫绫诲瀷
+ {
+ $("#HPayTypeName").val(obj[0].宸ヨ祫绫诲瀷鍚嶇О);
+ $("#HPayType").val(obj[0].HItemID);
+ }
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 鍒楄〃
+ function GetGyMaterial(data) //杩斿洖鐗╂枡
+ {
+ OptionData = data
+ }
+ function GetProcessValue(data) //杩斿洖宸ュ簭
+ {
+ OptionData = data[0]
+ }
+ function GetHEmpListValue(data) //杩斿洖鑱屽憳
+ {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
index d52f974..851bf37 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
@@ -861,7 +861,7 @@
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', style: 'background-color: #f9f9f9;' }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: "HUnitNumber" } //f7
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', event: "HUnitNumber" } //f7
, { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HProcID', title: '宸ュ簭ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcNumber" } //f7
@@ -993,7 +993,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1009,6 +1009,12 @@
$("#HDeptID").val(checkStatus.data[0].HDeptID);//閮ㄩ棬浠ｇ爜
$("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
//鏍规嵁鐝粍鍐呯爜鑾峰彇瀛愯〃鏁版嵁
layer.confirm(
'鏄惁纭畾瑕嗙洊瀛愯〃鍘熸暟鎹紵'
@@ -1019,12 +1025,9 @@
getEmp_BasedGroupID(HGroupID);
layer.close(index);
}, function (index) { //鎸夐挳2鍥炶皟鍑芥暟
-
+
});
-
- layer.close(index);//鍏抽棴寮圭獥
}
- , btn2: function (index, layero) { }
})
}
//#endregion
@@ -1610,9 +1613,14 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
//鑾峰彇宸ヤ环
- var HMaterID = checkStatus.data[0].HItemID;
+ var HMaterID = OptionData.HItemID;
var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
var HPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);
@@ -1621,25 +1629,25 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
if (HPrice != -1) {
obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "HMaterNumber": checkStatus.data[0].鐗╂枡浠ｇ爜
- , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
- , "HUnitID": checkStatus.data[0].HUnitID
- , "HUnitNumber": checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜
- , "HUnitName": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ "HMaterID": OptionData.HItemID
+ , "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterModel": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "HUnitNumber": OptionData.璁￠噺鍗曚綅浠ｇ爜
+ , "HUnitName": OptionData.璁￠噺鍗曚綅鍚嶇О
, "HPrice": HPrice
, "HMoney": HMoney
})
} else {
obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "HMaterNumber": checkStatus.data[0].鐗╂枡浠ｇ爜
- , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
- , "HUnitID": checkStatus.data[0].HUnitID
- , "HUnitNumber": checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜
- , "HUnitName": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ "HMaterID": OptionData.HItemID
+ , "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterModel": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "HUnitNumber": OptionData.璁￠噺鍗曚綅浠ｇ爜
+ , "HUnitName": OptionData.璁￠噺鍗曚綅鍚嶇О
, "HPrice": 0
, "HMoney": 0
})
@@ -1648,7 +1656,6 @@
//鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
Sub1ChangeSub2();
Sub2ChangeMain();
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1673,10 +1680,15 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
//鑾峰彇宸ヤ环
var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
- var HProcID = checkStatus.data[0].HItemID;
+ var HProcID = OptionData.HItemID;
var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
var HPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);
var HMoney = obj.data.HQty * HPrice;
@@ -1684,17 +1696,17 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
if (HPrice != -1) {
obj.update({
- "HProcID": checkStatus.data[0].HItemID
- , "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
+ "HProcID": OptionData.HItemID
+ , "HProcNumber": OptionData.宸ュ簭浠ｇ爜
+ , "HProcName": OptionData.宸ュ簭鍚嶇О
, "HPrice": HPrice
, "HMoney": HMoney
})
} else {
obj.update({
- "HProcID": checkStatus.data[0].HItemID
- , "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
+ "HProcID": OptionData.HItemID
+ , "HProcNumber": OptionData.宸ュ簭浠ｇ爜
+ , "HProcName": OptionData.宸ュ簭鍚嶇О
, "HPrice": 0
, "HMoney": 0
})
@@ -1702,8 +1714,6 @@
//鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
Sub1ChangeSub2();
Sub2ChangeMain();
-
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1728,27 +1738,30 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
-
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
//鑾峰彇宸ヤ环
var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
- var HSourceID = checkStatus.data[0].HItemID;
+ var HSourceID = OptionData.HItemID;
var HPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);
var HMoney = obj.data.HQty * HPrice;
if (HPrice != -1) {
obj.update({
- "HSourceID": checkStatus.data[0].HItemID
- , "HSourceNumber": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
- , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ "HSourceID": OptionData.HItemID
+ , "HSourceNumber": OptionData.鐢熶骇璧勬簮浠ｇ爜
+ , "HSourceName": OptionData.鐢熶骇璧勬簮鍚嶇О
, "HPrice": HPrice
, "HMoney": HMoney
})
} else {
obj.update({
- "HSourceID": checkStatus.data[0].HItemID
- , "HSourceNumber": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
- , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ "HSourceID": OptionData.HItemID
+ , "HSourceNumber": OptionData.鐢熶骇璧勬簮浠ｇ爜
+ , "HSourceName": OptionData.鐢熶骇璧勬簮鍚嶇О
, "HPrice": 0
, "HMoney": 0
})
@@ -1757,8 +1770,6 @@
//鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
Sub1ChangeSub2();
Sub2ChangeMain();
-
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1784,7 +1795,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1797,11 +1808,19 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].HNumber
- , "HEmpName": checkStatus.data[0].HName
+ , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
+ , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
, "HEmpRate": checkStatus.data[0].HEmpRate
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ obj.update({
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
+ , "HEmpRate": OptionData.HEmpRate
+ })
}
})
}
@@ -2213,11 +2232,38 @@
});
- function GetProcessValue(data) //杩斿洖宸ュ簭
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ console.log(obj);
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ $("#HDeptID").val(obj[0].HDeptID);//閮ㄩ棬浠ｇ爜
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ }
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 鍒楄〃
+ function GetGyMaterial(data) //杩斿洖鐗╂枡
{
OptionData = data
}
-
+ function GetProcessValue(data) //杩斿洖宸ュ簭
+ {
+ OptionData = data[0]
+ }
+ function GetGySource(data) //杩斿洖鐢熶骇璧勬簮
+ {
+ OptionData = data[0]
+ }
+ function GetHEmpListValue(data) //杩斿洖鑱屽憳
+ {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
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..22f9869 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"
@@ -740,7 +740,7 @@
, { 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: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes", hide: true }
@@ -1382,7 +1382,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 +1392,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 +1410,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 +1427,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 +1443,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1453,7 +1457,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 +1467,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 +1483,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 +1627,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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
index 45a09c6..cbe43b9 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
@@ -252,7 +252,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script>
-
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -283,7 +283,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -930,7 +930,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -940,13 +940,16 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ },
+ end: function () {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
- , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
})
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -971,14 +974,17 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
-
+ OptionData = checkStatus.data[0];
+
+ layer.close(index);//鍏抽棴寮圭獥
+ },
+ end: function () {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HDuSubsidyItemID": checkStatus.data[0].HItemID
- , "HDuSubsidyItemNumber": checkStatus.data[0].鎵ｈˉ璧勬枡浠ｇ爜
- , "HDuSubsidyItemName": checkStatus.data[0].鎵ｈˉ璧勬枡鍚嶇О
+ "HDuSubsidyItemID": OptionData.HItemID
+ , "HDuSubsidyItemNumber": OptionData.鎵ｈˉ璧勬枡浠ｇ爜
+ , "HDuSubsidyItemName": OptionData.鎵ｈˉ璧勬枡鍚嶇О
})
- layer.close(index);//鍏抽棴寮圭獥
}
})
}
@@ -1113,8 +1119,28 @@
});
-
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ 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
+ }
+ function GetHDuSubsidyItemBillValue(data) //杩斿洖鎵ｈˉ椤圭洰
+ {
+ OptionData = data[0]
+ }
</script>
</body>
</html>
\ No newline at end of file
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 6e8b2e9..b7023e0 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"
@@ -1426,6 +1426,8 @@
{
$("#HGroupName").val(obj[0].鐝粍鍚嶇О);
$("#HGroupID").val(obj[0].HItemID);
+ $("#HDeptID").val(obj[0].HDeptID);//閮ㄩ棬浠ｇ爜
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
}
//鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 鍒楄〃
function GetHEmpListValue(data) //杩斿洖鑱屽憳
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html"
index ea263b4..303a9da 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html"
@@ -745,7 +745,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -810,7 +810,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1169,7 +1169,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1206,6 +1206,13 @@
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ obj.update({
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
+ })
}
})
}
@@ -1388,8 +1395,28 @@
});
-
-
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ 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 GetHEmpListValue(data) //杩斿洖鑱屽憳
+ {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
index 85d36d0..8f3ee32 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
@@ -205,6 +205,15 @@
layer.alert('缂栬緫琛岋細<br>' + JSON.stringify(data))
}
});
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHProcessReportValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
var index0 = layer.load(0, { shade: false });
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
index 22f4ab9..0186565 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
@@ -342,7 +342,15 @@
$('#HEndDate').prop('disabled', false);
}
});
-
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHProductionRerurnValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
--
Gitblit v1.9.1