From 01ef7c649cb64c63777a551e13a84600a561ef01 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 28 六月 2024 16:54:03 +0800
Subject: [PATCH] 工资模块弹框更改
---
WebTM/views/工资管理/加班申请/Pay_OverApplyBill.html | 14 +-
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillEdit.html | 76 +++++++-----
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html | 24 ++--
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 36 +++--
WebTM/views/工资管理/工资单/Pay_PayMentBill.html | 77 ++++++------
WebTM/views/工资管理/班组职员清单/Gy_GroupEmpBillEdit.html | 12 +-
WebTM/views/工资管理/请假申请/Pay_OutApplyBill.html | 50 ++++----
WebTM/views/工资管理/Gy_DuSubsidyItemBillList.html | 2
WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBill.html | 32 ++--
WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBill.html | 14 +-
WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBill_KS.html | 10
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html | 4
WebTM/views/工资管理/工资运算/Pay_SingleBalBillOperation.html | 4
13 files changed, 186 insertions(+), 169 deletions(-)
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 ae828c1..a11c2cd 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"
@@ -170,7 +170,7 @@
soulTable.render(this);
}
, cols: [[
- { type: 'radio', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '鎵ｈˉ璧勬枡浠ｇ爜', title: '鎵ｈˉ璧勬枡浠ｇ爜', sort: true }
, { field: '鎵ｈˉ璧勬枡鍚嶇О', title: '鎵ｈˉ璧勬枡鍚嶇О', sort: true}
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 3fdfd11..87534a9 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"
@@ -753,7 +753,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -765,7 +765,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) { }
@@ -784,7 +784,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -796,7 +796,7 @@
}
$("#HMangerID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HMangerName").val(checkStatus.data[0].HName);//鍚嶇О
+ $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1110,7 +1110,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1123,8 +1123,8 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
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].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
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 25a7959..3bf8201 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"
@@ -667,7 +667,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -679,7 +679,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) { }
@@ -1058,7 +1058,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1068,6 +1068,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
//鑾峰彇宸ヤ环
var HMaterID = checkStatus.data[0].HItemID;
var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
@@ -1077,18 +1078,18 @@
if (HOldPrice != -1) {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "HMaterNumber": checkStatus.data[0].HNumber
- , "HMaterName": checkStatus.data[0].HName
- , "HMaterModel": checkStatus.data[0].HModel
+ "HMaterID": OptionData.HItemID
+ , "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterModel": OptionData.瑙勬牸鍨嬪彿
, "HOldPrice": HOldPrice
})
} else {
obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "HMaterNumber": checkStatus.data[0].HNumber
- , "HMaterName": checkStatus.data[0].HName
- , "HMaterModel": checkStatus.data[0].HModel
+ "HMaterID": OptionData.HItemID
+ , "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterModel": OptionData.瑙勬牸鍨嬪彿
})
}
layer.close(index);//鍏抽棴寮圭獥
@@ -1106,7 +1107,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1116,6 +1117,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
//鑾峰彇宸ヤ环
var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
var HProcID = checkStatus.data[0].HItemID;
@@ -1127,14 +1129,14 @@
obj.update({
"HProcID": checkStatus.data[0].HItemID
, "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭
+ , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
, "HOldPrice": HOldPrice
})
} else {
obj.update({
"HProcID": checkStatus.data[0].HItemID
, "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭
+ , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
})
}
layer.close(index);//鍏抽棴寮圭獥
@@ -1152,7 +1154,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
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 99f2c2b..e918160 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"
@@ -553,11 +553,11 @@
, { 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: '璁′欢宸ヨ祫', totalRow: true }
, { field: 'HTimesPay', title: '璁℃椂宸ヨ祫', event: "HTimesPay", totalRow: true }
@@ -665,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -677,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) { }
@@ -971,7 +971,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -984,8 +984,11 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
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].鑱屽憳鍚嶇О
+ , "HPostID": checkStatus.data[0].HPostID
+ , "HPostNumber": checkStatus.data[0].宀椾綅浠ｇ爜
+ , "HPostName": checkStatus.data[0].宀椾綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1004,36 +1007,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;
})
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 beae012..cb93a4e 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"
@@ -332,8 +332,8 @@
, { field: 'HEmpName', title: '鑱屽憳鍚嶇О', width: 100, style: 'background-color: #f9f9f9;' }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 300, style: 'background-color: #f9f9f9;' }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200, style: 'background-color: #f9f9f9;' }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100, style: 'background-color: #f9f9f9;' }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color: #f9f9f9;' }
, { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcNumber", width: 100 }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О', width: 100, style: 'background-color: #f9f9f9;' }
@@ -357,7 +357,7 @@
$("#HMaker").val(sessionStorage["HUserName"]);
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{
- "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
+ "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
, "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0
}];
@@ -398,7 +398,7 @@
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
var NewRow = {
- "HEmpID": "", "HEmpNumber": "", "HEmpName": "","HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "","HProcID":0, "HProcNumber": "", "HProcName": ""
+ "HEmpID": "", "HEmpNumber": "", "HEmpName": "","HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "","HProcID":0, "HProcNumber": "", "HProcName": ""
, "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0
};
@@ -450,7 +450,6 @@
}
});
}
-
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event === 'HEmpCheck') //鑱屽憳
@@ -463,7 +462,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -472,23 +471,29 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- HEmpName: checkStatus.data[0].HName
- , HEmpID: checkStatus.data[0].HItemID
- , HEmpNumber: checkStatus.data[0].HNumber
- });
+ "HEmpID": checkStatus.data[0].HItemID
+ , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
+ , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
+ })
layer.close(layer.index);
}
, btn2: function (index, layero) {
},
end: function () {
-
+ obj.update({
+ "HEmpID": OptionData.HItemID
+ , "HEmpNumber": OptionData.鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData.鑱屽憳鍚嶇О
+ })
}
});
}
- if (obj.event === 'HMaterCode') //鐗╂枡浠ｇ爜
+ if (obj.event === 'HMaterNumber') //鐗╂枡浠ｇ爜
{
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -499,7 +504,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -509,15 +514,15 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+ OptionData = checkStatus.data[0];
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HMaterID: checkStatus.data[0].HItemID,
- HMaterCode: checkStatus.data[0].HNumber,
- HMaterName: checkStatus.data[0].HName,
- HMaterSpec: checkStatus.data[0].HModel,
- HQty: 1, //瀹炴敹鏁伴噺
- HMoney: 0, //閲戦
+ "HMaterID": checkStatus.data[0].HItemID
+ , "HMaterNumber": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HQty": 1 //瀹炴敹鏁伴噺
+ , "HMoney": 0 //閲戦
});
$.ajax({
url: GetWEBURL() + "Pay_OtherBalBill/getOtherBalBillPrice",
@@ -532,8 +537,8 @@
} else {
obj.update({
- HPrice: result.data[0].鍗曚环
- ,HMoney: obj.data.HQty * result.data[0].鍗曚环
+ "HPrice": result.data[0].鍗曚环
+ ,"HMoney": obj.data.HQty * result.data[0].鍗曚环
});
}
}
@@ -548,7 +553,7 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+
}
});
}
@@ -563,7 +568,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -573,10 +578,11 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HProcName: checkStatus.data[0].宸ュ簭
+ HProcName: checkStatus.data[0].宸ュ簭鍚嶇О
, HProcID: checkStatus.data[0].HItemID
, HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
});
+ OptionData = checkStatus.data[0];
$.ajax({
url: GetWEBURL() + "Pay_OtherBalBill/getOtherBalBillPrice",
type: "GET",
@@ -604,7 +610,11 @@
, btn2: function (index, layero) {
},
end: function () {
-
+ obj.update({
+ "HProcID": OptionData.HItemID
+ , "HProcNumber": OptionData.宸ュ簭浠ｇ爜
+ , "HProcName": OptionData.宸ュ簭鍚嶇О
+ })
}
});
}
@@ -744,7 +754,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -754,7 +764,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroupName").val(checkStatus.data[0].鐝粍);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -782,7 +792,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -792,7 +802,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -820,7 +830,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -830,7 +840,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -858,7 +868,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/宸ヨ祫绠＄悊/Gy_WorkPayTypeBillList.html?Type=HPayType', 'yes'],
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkPayTypeList.html?Type=HWorkPayType&OperationType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
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 8aa79d2..d52f974 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"
@@ -1034,26 +1034,25 @@
//鎵撳紑閮ㄩ棬灏忕獥浣�
layer.open({
type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "閮ㄩ棬鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID", "yes"]
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
-
- $("#HDeptID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HDeptName").val(checkStatus.data[0].HName);//鍚嶇О
- layer.close(index);//鍏抽棴寮圭獥
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
@@ -1664,7 +1663,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1687,7 +1686,7 @@
obj.update({
"HProcID": checkStatus.data[0].HItemID
, "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭
+ , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
, "HPrice": HPrice
, "HMoney": HMoney
})
@@ -1695,7 +1694,7 @@
obj.update({
"HProcID": checkStatus.data[0].HItemID
, "HProcNumber": checkStatus.data[0].宸ュ簭浠ｇ爜
- , "HProcName": checkStatus.data[0].宸ュ簭
+ , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
, "HPrice": 0
, "HMoney": 0
})
@@ -2214,7 +2213,10 @@
});
-
+ function GetProcessValue(data) //杩斿洖宸ュ簭
+ {
+ OptionData = data
+ }
</script>
</body>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html"
index 0e70367..cbaad44 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html"
@@ -97,7 +97,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -107,7 +107,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
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 bb7ba1d..aa2bc98 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"
@@ -803,7 +803,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -814,8 +814,8 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- $("#HDeptID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HDeptName").val(checkStatus.data[0].HName);//鍚嶇О
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -834,7 +834,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID", "yes"]
+ , content: ["../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -846,7 +846,7 @@
}
$("#HGroupID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HGroupName").val(checkStatus.data[0].鐝粍);//鍚嶇О
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -865,7 +865,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -877,7 +877,7 @@
}
$("#HMangerID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HMangerName").val(checkStatus.data[0].HName);//鍚嶇О
+ $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -896,7 +896,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -908,7 +908,7 @@
}
$("#HMaterID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HMaterName").val(checkStatus.data[0].HName);//鍚嶇О
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -1382,7 +1382,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1403,8 +1403,8 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var HEmpID = checkStatus.data[0].HItemID;
- var HEmpNumber = checkStatus.data[0].HNumber;
- var HEmpName = checkStatus.data[0].HName;
+ 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"];
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 5d1e925..45a09c6 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"
@@ -606,7 +606,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -618,7 +618,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) { }
@@ -637,7 +637,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID", "yes"]
+ , content: ["../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -649,7 +649,7 @@
}
$("#HGroupID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HGroupName").val(checkStatus.data[0].鐝粍);//鍚嶇О
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -930,7 +930,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -943,8 +943,8 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
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].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
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_KS.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_KS.html"
index 21aaed4..ffb09f7 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_KS.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_KS.html"
@@ -621,7 +621,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -633,7 +633,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) { }
@@ -955,7 +955,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -968,8 +968,8 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
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].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
index 838e7f0..46e27b2 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
@@ -320,7 +320,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鎵�灞炵粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -328,7 +328,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEntryName").val(checkStatus.data[0].HName);
+ $("#HEntryName").val(checkStatus.data[0].鏍哥畻鏂瑰紡缁勫悕绉�);
$("#HEntryID").val(checkStatus.data[0].HItemID);
//$("#HDeptNumber").val(checkStatus.data[0].HNumber);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
index eb997c5..556c327 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
@@ -338,7 +338,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -348,9 +348,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HEmpName: checkStatus.data[0].HName
- , HEmpID: checkStatus.data[0].HItemID
- , HEmpNumber: checkStatus.data[0].HNumber
+ "HEmpID": checkStatus.data[0].HItemID
+ , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
+ , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
});
layer.close(layer.index);
@@ -445,7 +445,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -455,7 +455,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroupName").val(checkStatus.data[0].鐝粍);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
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 9479b6b..ea263b4 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"
@@ -779,7 +779,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -791,7 +791,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) { }
@@ -810,7 +810,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -822,7 +822,7 @@
}
$("#HMangerID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HMangerName").val(checkStatus.data[0].HName);//鍚嶇О
+ $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1169,7 +1169,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1181,30 +1181,30 @@
}
var HEmpID = checkStatus.data[0].HItemID;
- var HEmpNumber = checkStatus.data[0].HNumber;
- var HEmpName = checkStatus.data[0].HName;
- var HShifts = getHShifts_BasedHEmpID(HEmpID);
- if (HShifts.count == 1) {
- var HShiftsID = HShifts.HShiftsID;
- var HShiftsNumber = HShifts.HShiftsNumber;
- var HShiftsName = HShifts.HShiftsName;
+ var HEmpNumber = checkStatus.data[0].鑱屽憳鍚嶇О;
+ var HEmpName = checkStatus.data[0].鑱屽憳浠ｇ爜;
+ /*var HShifts = getHShifts_BasedHEmpID(HEmpID);*/
+ //if (HShifts.count == 1) {
+ // var HShiftsID = HShifts.HShiftsID;
+ // var HShiftsNumber = HShifts.HShiftsNumber;
+ // var HShiftsName = HShifts.HShiftsName;
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HEmpID": checkStatus.data[0].HItemID
+ // , "HEmpNumber": checkStatus.data[0].鑱屽憳鍚嶇О
+ // , "HEmpName": checkStatus.data[0].鑱屽憳浠ｇ爜
+ // , "HShiftsID": HShiftsID
+ // , "HShiftsNumber": HShiftsNumber
+ // , "HShiftsName": HShiftsName
+ // })
+ //} else {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].HNumber
- , "HEmpName": checkStatus.data[0].HName
- , "HShiftsID": HShiftsID
- , "HShiftsNumber": HShiftsNumber
- , "HShiftsName": HShiftsName
+ , "HEmpNumber": checkStatus.data[0].鑱屽憳浠ｇ爜
+ , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
})
- } else {
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HEmpID": checkStatus.data[0].HItemID
- , "HEmpNumber": checkStatus.data[0].HNumber
- , "HEmpName": checkStatus.data[0].HName
- })
- }
+
layer.close(index);//鍏抽棴寮圭獥
}
})
--
Gitblit v1.9.1