From bd45155a8920fff12bc921d9166223e98430ce9f Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 15 四月 2024 17:29:11 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 8 ++--
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html | 25 ++++++++++--
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 8 ++--
WebTM/views/video/success.wav | 0
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html | 53 ++++++++++++++++++++------
WebTM/layuiadmin/Scripts/webConfig.js | 4 +-
6 files changed, 71 insertions(+), 27 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index fd98315..f07a5e2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
index 3686b84..252df04 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
@@ -428,7 +428,8 @@
icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
layer.closeAll("loading");
}
@@ -439,12 +440,22 @@
console.log("playSound");
var audio = document.getElementById("cs");
audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
}
//鎴愬姛鎻愮ず闊�
function playSound_OK() {
console.log("playSound_OK");
var audio = document.getElementById("cs2");
audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
}
//#region 鍒濆鍖栫晫闈�
@@ -532,7 +543,8 @@
form.render('select');
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
})
}
//鍒濆鍖栬〃鏍�
@@ -544,6 +556,9 @@
, height: 'full-60'
, cellMinWidth: 90
, limit: 50
+ , done: function () {
+ layer.closeAll("loading");
+ }
};
}
@@ -595,7 +610,8 @@
else {
layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
HSourceFlag = false;
}
@@ -648,7 +664,8 @@
$("#HSupID").val(d.data[0].HCusID);
$("#HSupName").val(d.data[0].HSupName);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
})
}
@@ -719,7 +736,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -799,7 +817,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -872,7 +891,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -941,7 +961,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -1010,7 +1031,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -1079,7 +1101,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -1169,6 +1192,7 @@
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -1245,6 +1269,7 @@
layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -1342,7 +1367,8 @@
$("#HSourceBillNo").focus();
});
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
layer.closeAll("loading");
}
@@ -1426,6 +1452,7 @@
});
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
@@ -1591,6 +1618,7 @@
});
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
@@ -1707,7 +1735,8 @@
$("#HWHName_B").val("");
$("#HSPName_B").val("");
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index 92356ba..97bf9d6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -290,8 +290,9 @@
var HMaker = sessionStorage["HUserName"]
var HBillerID = sessionStorage["HBillerID"]
var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
- var HSourceFlag = false //鏄惁宸叉壂鐮佹爣蹇�
- var OperationType = 0 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var HSourceFlag = false //鏄惁宸叉壂鐮佹爣蹇�
+ var HDisBillEntryList = false //鏄惁鍒涘缓骞舵覆鏌撹繃琛ㄦ牸
+ var OperationType = 0 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
var BarCodelistOption = [];
var columns = "";
@@ -410,14 +411,18 @@
, height: 'full-100'
, cellMinWidth: 90
, limit: 150
+ , done: function () {
+ layer.closeAll("loading");
+ }
};
//鏄庣粏娓呭崟
BarCodelistOption = {
elem: '#mx-table'
//, toolbar: '#toolbarDemo'
+ , page: true
, cellMinWidth: 90
- , limit: 3000
+ , limit: 50
, totalRow: true
, cols: [[
{ field: '鍖呭彿', title: '鍖呭彿', width: 80 }
@@ -1499,9 +1504,19 @@
listOption.cols = [columns];
listOption.data = result.data.Materlist;
listOption.totalRow = true;
- table.render(listOption);
BarCodelistOption.data = result.data.BarCodelist;
- table.render(BarCodelistOption);
+
+ if (!HDisBillEntryList) {
+ table.render(listOption); //鍒涘缓骞舵覆鏌撹〃鏍�
+ table.render(BarCodelistOption);
+ HDisBillEntryList = true;
+ }
+ else {
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.reload('wl-table', listOption); //瀵硅〃鏍艰繘琛岄噸杞�
+ table.cache['mx - table'] = null;
+ table.reload('mx-table', BarCodelistOption);
+ }
}
else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
diff --git a/WebTM/views/video/success.wav b/WebTM/views/video/success.wav
index 5946a7a..cffb64f 100644
--- a/WebTM/views/video/success.wav
+++ b/WebTM/views/video/success.wav
Binary files differ
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
index afd8877..bb59b78 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
@@ -537,7 +537,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
+ "HQCCheckItemID": 0, "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
}];
option = {
@@ -665,7 +665,7 @@
"HUnitName": data.鍗曚綅,
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
@@ -697,7 +697,7 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": 0,
@@ -727,7 +727,7 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
index ce1819c..dba1d08 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
@@ -538,7 +538,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
+ "HQCCheckItemID": 0, "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
}];
option = {
@@ -666,7 +666,7 @@
"HUnitName": data.鍗曚綅,
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
@@ -698,7 +698,7 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": 0,
@@ -727,7 +727,7 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
--
Gitblit v1.9.1