From 06f92c17e2178797c7f9b7244ac1063ae4bfa4f8 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 08 五月 2025 09:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html | 102 ++++++++++++++++++++++-----------
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html | 4
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 10 +-
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html | 15 ++++
WebTM/views/模治具管理/模治具点检保养/Sc_MouldMaintainBill_PDA.html | 12 +++
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 22 ++++++-
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html | 2
8 files changed, 118 insertions(+), 51 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 9a2d54d..ef6f3c2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -202,7 +202,7 @@
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -1780,7 +1780,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, btn1: function (index, layero) {
@@ -1805,8 +1805,16 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
- }
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": OptionData[0].HItemID
+ , "HEmpNumber": OptionData[0].鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData[0].鑱屽憳鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
});
}
//鐝粍浠ｇ爜
@@ -1958,6 +1966,12 @@
});
+
+ //鎿嶄綔鍛�
+ function GetHEmpValue(obj) {
+ OptionData = obj;
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
index 10584d5..464a917 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
@@ -168,8 +168,12 @@
<th>淇濆吇璁″垝</th>
<td class="bz_td">
<input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
- <input type="hidden" name="HMouldMaintainPlanInterID" class="layui-input LineHeight" id="HMouldMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
- <input type="hidden" name="HMouldMaintainPlanEntryID" class="layui-input LineHeight" id="HMouldMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
+ <input type="hidden" name="HPlanInterID" id="HPlanInterID" value="0" readonly>
+ <input type="hidden" name="HMouldMaintainPlanInterID" id="HMouldMaintainPlanInterID" value="0" readonly>
+ <input type="hidden" name="HMouldMaintainPlanEntryID" id="HMouldMaintainPlanEntryID" value="0" readonly>
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" readonly>
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" readonly>
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0" readonly>
</td>
</tr>
</tbody>
@@ -551,8 +555,12 @@
$("#HMouldMaintainRuleInterNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldMaintainRuleInterID").val(checkStatus.data[0].hmainid);
$("#HPlanNo").val(checkStatus.data[0].淇濆吇璁″垝鍙�);
+ $("#HPlanInterID").val(checkStatus.data[0].淇濆吇璁″垝id);
$("#HMouldMaintainPlanInterID").val(checkStatus.data[0].淇濆吇璁″垝id);
$("#HMouldMaintainPlanEntryID").val(checkStatus.data[0].淇濆吇璁″垝瀛恑d);
+ $("#HMainSourceBillNo").val(checkStatus.data[0].淇濆吇璁″垝鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].淇濆吇璁″垝id);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].淇濆吇璁″垝瀛恑d);
get_DocCheckItem2();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
index 00d45e6..0cea968 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
@@ -553,7 +553,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HRecDeptID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index 3462f5e..bab962d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -562,7 +562,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HRecDeptID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
index ba5e7ee..3f15d93 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
@@ -536,7 +536,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HRecDeptID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
@@ -572,7 +572,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HReceiveID == undefined ? 0 : LoadData[0].HReceiveID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷ID
$("#HErrMsgBackTypeName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //寮傚父绫诲瀷
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
index f8cfdf5..235ec7a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
@@ -1298,7 +1298,7 @@
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
get_Display_1(HinterID_S);
- get_Display_2(HinterID_S)
+ get_Display_2(HinterID_S);
}
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -3078,15 +3078,30 @@
//灏嗘暟鎹帓绋嬪埌缃戞牸
function SetInfoToGrid(grd, ds, dsPre, iRow, sLeftQty, sWorkQty, bAddFlag, HPlanDay) {
+ var dsindex = 0;
+ var HPCDate_Reset = "";
//鍒ゆ柇褰撳墠鐢熶骇璧勬簮宸茬粡鎺掍骇鍒板摢涓棩鏈熶簡锛屽綋鍓嶇敓浜ц祫婧愯繕鏈変骇鑳界殑鏈�杩戞棩鏈熶笌褰撳墠璁㈠崟鐨勬帓浜ф棩鏈熶笉绗︼紝鍒欓噸缃綋鍓嶆帓浜ф棩鏈�
if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') != Format(HPCDate, 'yyyy/MM/dd')) {
+
+ for (var i = 0; i < ds.length; i++) {
+ if (Format(ds[i]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+ //鐢ㄦ潵閲嶇疆褰撳墠鎺掍骇鏃ユ湡锛堟湁浜涜鍗曞紑宸ユ棩鏈熼潬鍚庯紝瑕佸厛鎶婂悗闈㈡棩鏈熺殑璧勬簮宸ユ椂鍗犵敤锛屾帓浜х粨鏉熷悗鍦ㄦ妸鏃ユ湡璋冨洖鍒版病琚帓浜х殑鏃ユ湡锛�
+ if (i != 0) {
+ HPCDate_Reset = ds[0]["鏃ユ湡"];
+ }
+
+ //鍖归厤璁㈠崟閫傚悎鐨勬帓浜ф棩鏈�
+ dsindex = i;
+ break;
+ }
+ }
//褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡婊¤冻鏈�鏃╁紑宸ユ棩鏈燂紝鍒欓噸缃帓浜ф棩鏈熶负褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡
- if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+ if (Format(ds[dsindex]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
if (HArrIndex.length + HArrIndex_PC.length == option.data.length) {
HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
} else {
- HPCDate = Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd');
+ HPCDate = Format(ds[dsindex]["鏃ユ湡"], 'yyyy/MM/dd');
}
//濡傛灉鏄渶鍚庝竴绗旇鍗曞湪鎺掍骇锛屽垯閲嶇疆鎺掍骇鏃ユ湡涓烘渶鏃╁紑宸ユ棩鏈燂紙涓嬫柟浼氬垽鏂紝涓嶄細瓒呬骇鑳芥帓浜э級
@@ -3094,7 +3109,6 @@
HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
}
} else { //褰撳墠鏃ユ湡涓嶇鍚堣鍗曠殑鏈�鏃╁紑宸ユ棩鏈燂紝鍒欐妸璁㈠崟閲嶆柊鍔犲叆寰呮帓浜у垪琛�
-
//灏嗕笅鏍囧姞鍏ユ湭鎺掍骇璁㈠崟鏁扮粍
if (HArrIndex.indexOf(iRow) == -1) {
HArrIndex.push(iRow);
@@ -3314,7 +3328,12 @@
//oSub.iRow = iRow;
//oSub.iCol = j;
//option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
- HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//璧嬪�兼帓浜ф棩鏈�
+
+ if (HPCDate_Reset != "") {
+ HPCDate = HPCDate_Reset;
+ } else {
+ HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//璧嬪�兼帓浜ф棩鏈�
+ }
HIsPriority = false;
break;
@@ -3794,6 +3813,13 @@
//鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
var num = [];
for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || option.data[i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+ option.data[i].鐗╂枡鍚嶇О = option.data[i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (option.data[i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || option.data[i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+ option.data[i].瑙勬牸鍨嬪彿 = option.data[i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+
if (option.data[i] != "") {
if (parseFloat(option.data[i]["鎷嗗崟鏁伴噺"]) == 0) {
return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
@@ -3806,42 +3832,50 @@
}
}
- //var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr +"&鍜�" + sessionStorage["HUserName"];
-
+ var HDataSub = [];
var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
- async: HAsync,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- if ($("#HWorkShopID").val() == 0) {
- get_FastQuery(1);
- HAsync = true;
+
+ //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
+ for (var i = 0; i < option.data.length; i += 100) {
+ HDataSub = option.data.slice(i, i + 100)
+ console.log("寮�濮嬩繚瀛樺墠" + i + "鏉¤鍗�");
+
+ var sSubStr = JSON.stringify(HDataSub);
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: HAsync,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.close(index);
+ //layer.msg("淇濆瓨鎴愬姛");
}
else {
- get_FastQuery(2);
+ //layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
HAsync = true;
}
- layer.close(index);
- layer.msg("淇濆瓨鎴愬姛");
- }
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ },
+ error: function (err) {
+ //layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
HAsync = true;
}
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- HAsync = true;
- }
- });
+ });
+ }
+ layer.close(index);
+ if ($("#HWorkShopID").val() == 0) {
+ get_FastQuery(1);
+ HAsync = true;
+ }
+ else {
+ get_FastQuery(2);
+ HAsync = true;
+ }
}
function set_AddNew1(num) {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 9b28a56..04fb572 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1403,7 +1403,7 @@
case 'HWorkQty': //绾﹀綋绯绘暟
if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
obj.update({
- HYDCoefficient: (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6)
+ HYDCoefficient: !isNaN(parseFloat((localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) : 0
});
}
break;
@@ -2277,7 +2277,7 @@
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6)//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6) : 0;//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
j++;
}
}
@@ -2312,7 +2312,7 @@
, "宸ユ": OptionData[0].宸ユ鍚嶇О
, "鏍囧噯宸ヤ环": OptionData[0].鏍囧噯宸ヤ环
, "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
- , "HYDCoefficient": (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6)
+ , "HYDCoefficient": !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6) : 0
})
OptionData = [];
@@ -2712,7 +2712,7 @@
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
j++;
}
@@ -2753,7 +2753,7 @@
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
j++;
}
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
index 84bb748..8444619 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
@@ -374,9 +374,20 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HSourceName").val("");
- $('#HSourceID').val("0");
+ $('#HSourceID').val("");
+ var HStatus = $("#HReadFlag").val();//闃呰鐘舵��
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HSourceID = $("#HSourceID").val();//鐢熶骇璧勬簮
+ sWhere = {
+ HStatus: HStatus
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HSourceID: HSourceID
+ }
+ get_Display(JSON.stringify(sWhere));
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
- get_Display(sWhere);
}
//#endregion
--
Gitblit v1.9.1