From 9be58bb270f68eddf094a5f89f8aab600eb8b3d9 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 14 十月 2021 11:18:26 +0800
Subject: [PATCH] 器具管理模块所有页面模具和模治具改成器具
---
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBill.html | 21 ++++++++--
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 14 +++---
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillList.html | 19 +++++----
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBill.html | 18 ++++++--
4 files changed, 47 insertions(+), 25 deletions(-)
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_SingleBalBill.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_SingleBalBill.html"
index 63cecc7..d3d841c 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_SingleBalBill.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_SingleBalBill.html"
@@ -309,7 +309,7 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100 }
, { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCheck', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 190 }
//, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
@@ -339,9 +339,9 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HChecker").val(sessionStorage["HUserName"]);
- $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HCloseMan").val(sessionStorage["HUserName"]);
$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+ $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{
@@ -686,6 +686,14 @@
, "Box2": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
});
} else {
@@ -717,7 +725,7 @@
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
- $("#HInterID").val(0);
+ $("#HInterID").val(d.data[0].HInterID);
}
});
}
@@ -860,7 +868,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷);
+ $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷鍚嶇О);
$("#HPayID").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\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.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_SingleBalBillList.html"
index f514717..edf353f 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_SingleBalBillList.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_SingleBalBillList.html"
@@ -155,21 +155,21 @@
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 180 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
- , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜', width: 180 }
- , { field: '鑱屽憳', title: '鑱屽憳', width: 125 }
+ , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 180 }
+ , { field: 'HEmpName', title: '鑱屽憳', width: 125 }
, { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
- , { field: '宸ヨ祫浠ｇ爜', title: '宸ヨ祫浠ｇ爜', width: 180 }
+ //, { field: '宸ヨ祫浠ｇ爜', title: '宸ヨ祫浠ｇ爜', width: 180 }
, { field: '宸ヨ祫绫诲瀷', title: '宸ヨ祫绫诲瀷', width: 125 }
, { field: '鎽樿', title: '鎽樿', width: 125 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 125 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 125 }
+ , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', width: 125 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 125 }
//, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', width: 200, hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 125 }
+ , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', width: 125 }
//, { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
//, { field: '鍗曚环', title: '鍗曚环', width: 125 }
//, { field: '閲戦', title: '閲戦', width: 125 }
@@ -279,7 +279,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Pay_SingleBalBill/DeltetSingleBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID },
success: function (result) {
if (result.count == 1) {
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_OtherBalBill.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_OtherBalBill.html"
index e7be70b..d281c14 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_OtherBalBill.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_OtherBalBill.html"
@@ -339,9 +339,9 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HChecker").val(sessionStorage["HUserName"]);
- $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HCloseMan").val(sessionStorage["HUserName"]);
$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+ $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{
@@ -384,7 +384,10 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcNumber": "", "HProcName": "", "HSourceCode": "", "HSourceName": "", "HEmpCode": "", "HEmpName": "", "HTimes": 0, "HQty": 0, "HPrice": 0, "HPriceRate": 0, "HSubsidyQty": 0, "HSubsidyMoney": 0, "HSubsidyTotal": 0, "HDeuctTotal": 0, "HPackQty": 0, "HPackPrice": 0, "HPackMoney": 0, "HPackMaterID": 0, "HMoney": 0, "HICMOInterID": 0, "HICMOBillNo": 0, "HProcReportInterID": 0, "HProcReportEntryID": 0, "HProcReportBillNo": 0, "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HRelationQty": 0, "HRelationQty": 0, "HRelationMoney": 0, "HCloseMan": 0, "HCloseDate": 0, "HCloseType": 0, "HRemark": "" };
+ var NewRow = {
+ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
+ , "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0
+ , "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0, "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -686,6 +689,14 @@
, "Box2": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
});
} else {
@@ -717,7 +728,7 @@
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
- $("#HInterID").val(0);
+ $("#HInterID").val(d.data[0].HInterID);
}
});
}
@@ -860,7 +871,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷);
+ $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷鍚嶇О);
$("#HPayID").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\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.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_OtherBalBillList.html"
index d44a7c7..a29deb8 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_OtherBalBillList.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_OtherBalBillList.html"
@@ -155,18 +155,21 @@
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 180 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
- , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜', width: 180 }
- , { field: '鑱屽憳', title: '鑱屽憳', width: 125 }
+ , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 180 }
+ , { field: 'HEmpName', title: '鑱屽憳', width: 125 }
+ , { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
+ //, { field: '宸ヨ祫浠ｇ爜', title: '宸ヨ祫浠ｇ爜', width: 180 }
+ , { field: '宸ヨ祫绫诲瀷', title: '宸ヨ祫绫诲瀷', width: 125 }
, { field: '鎽樿', title: '鎽樿', width: 125 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 125 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 125 }
+ , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', width: 125 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 125 }
//, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', width: 200, hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 125 }
+ , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', width: 125 }
//, { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
//, { field: '鍗曚环', title: '鍗曚环', width: 125 }
//, { field: '閲戦', title: '閲戦', width: 125 }
@@ -186,8 +189,8 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125, hide: true }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125, hide: true}
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125 }
]]
};
}
@@ -276,7 +279,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Pay_OtherBalBill/DeltetOtherBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID },
success: function (result) {
if (result.count == 1) {
--
Gitblit v1.9.1