From f4a892233ef13cd34ca772185eaf789d0e850b37 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 08 七月 2023 15:13:49 +0800
Subject: [PATCH] 扫码弹窗问题解决
---
igds-web/src/main/resources/static/admin/inout/in-check.js | 147 ++++++++++++++-----------------------------------
1 files changed, 42 insertions(+), 105 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index a0dc3e9..594983d 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -66,11 +66,26 @@
//鏄剧ず鍏ュ簱娴佺▼
showProgress();
-
- // 鍒濆鍖朩ebSocket
- //initInoutWS(deptId, bizType, progress, userId);
});
+window.onbeforeunload = function () {
+ console.log('椤甸潰鍒锋柊涔嬪墠瑙﹀彂');
+}
+window.onunload = function () {
+ console.log('椤甸潰鍒锋柊瀹屾垚瑙﹀彂');
+}
+window.onload = function () {
+
+ //鎵弿鏋嚜鍔ㄥ洖杞︿簨浠�
+ $('#checkId').bind('keyup', function (event) {
+ if (event.keyCode == "13") {
+ // //鍘绘帀鐒︾偣锛岄槻姝㈠埛鏂伴〉闈�
+ // $('#checkId').blur();
+ console.log("in-check", "鎵爜鏋�");
+ getDataByCheckId();
+ }
+ });
+};
// socket淇℃伅杩斿洖铏曠悊
function socketOnMessage(packet) {
@@ -170,6 +185,7 @@
});
form.render();
var data = form.val("form-detail");
+ console.log("getPriceByFoodLevel")
$.ajax({
type: "POST",
@@ -180,7 +196,9 @@
success: function (result) {
if (result.code != "0000") {
layer.msg(result.msg);
+ console.log("getPriceByFoodLevel", "!=0000")
} else {
+ console.log("getPriceByFoodLevel", "==0000")
$("#check-result-tip2").text("绮瀹氫环锛�" + result.data.price + "鍏�/鍏枻");
}
},
@@ -213,82 +231,6 @@
// window.parent.openTab(url, "鍖栭獙缁撴灉瀵煎嚭", "checkDataExport");
};
-// 鏍规嵁妯″紡鍚姩寮�濮嬫墻鏍�
-function checkExe(type) {
- checkDto.type = type;
- var param = JSON.stringify(checkDto);
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../api/check/check-exe",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: param,
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
- }
- },
- error: function () {
- layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
- }
- });
-};
-
-// 鍏抽棴鎵︽牱鏈哄櫒
-function checkStop() {
- var param = JSON.stringify(checkDto);
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../api/check/stop",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: param,
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
- }
- },
- error: function () {
- layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
- }
- });
-};
-
-// 鎵︽牱鏈哄浣�
-function checkReset() {
- var param = JSON.stringify(checkDto);
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../api/check/reset",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: param,
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
- }
- },
- error: function () {
- layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
- }
- });
-};
-
// 鎵︽牱鏈鸿В闄ゆ�ュ仠
function checkResetStop() {
var param = JSON.stringify(checkDto);
@@ -313,22 +255,6 @@
}
});
};
-
-//闅愯棌淇℃伅--鏇挎崲涓�*
-function replaceStr(str) {
- if (!str) {
- return "";
- }
- var split = str.split("");
-
- if (split.length == 1) {
- return "*";
- }
- if (split.length == 2 || split.length == 3) {
- return str.slice(0, 1) + "**"
- }
- return str.slice(0, 1) + "***" + str.slice(split.length - 1);
-}
// 鏇存柊鍖栭獙缁撴灉鎻愰啋锛屽彧鍋氭彁閱掞紝涓嶅仛鑷姩鍒ゆ柇
function updateCheckResultTip() {
@@ -362,6 +288,7 @@
* 娓叉煋琛ㄦ牸
*/
function renderTableCheckItem() {
+ console.log("renderTableCheckItem")
// 娓呯┖鏁版嵁
$("#tableCheckItem").empty();
table.render({
@@ -447,7 +374,6 @@
function showDetail(data) {
curCheckData = data;
-
if (!curCheckData.checkTime) {
curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
}
@@ -456,6 +382,7 @@
// 璧嬪��
form.val("form-detail", curCheckData);
form.render();
+ console.log("showDetail");
layer.open({
type: 1,
@@ -464,34 +391,38 @@
shade: 0,
content: $('#checkDetail'),
btnAlign: 'c',
- btn: ['浠呬繚瀛�', '淇濆瓨鎻愪氦','鍏抽棴鍙栨秷'],
+ btn: ['浠呬繚瀛�', '淇濆瓨鎻愪氦', '鍏抽棴鍙栨秷'],
yes: function () {
+ console.log("showDetail", "btn1")
// 鏇存柊鍒伴〉闈�
var data = form.val("form-detail");
// 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
Object.assign(curCheckData, data);
saveCheckData();
- if(scanCodeTag){
+ if (scanCodeTag) {
+ console.log("showScanCode")
showScanCode();
}
}, btn2: function () {
+ console.log("showDetail", "btn2")
// 鏇存柊鍒伴〉闈�
var data = form.val("form-detail");
// 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
Object.assign(curCheckData, data);
submit();
- if(scanCodeTag){
+ if (scanCodeTag) {
showScanCode();
}
}, btn3: function () {
parent.layer.closeAll();
- if(scanCodeTag){
+ console.log("showDetail", "btn3")
+ if (scanCodeTag) {
showScanCode();
}
},
closeBtn: 0
});
-
+ console.log("showDetail", "end");
// 鑾峰彇鍖栭獙椤逛俊鎭�
flushCheckItem(curCheckData.foodVariety);
getPriceByFoodLevel(curCheckData.foodLevel);
@@ -505,8 +436,8 @@
$("#check-result-tip").text("妫�楠岀粨鏋滐細#");
$("#price-result-tip2").text("绮瀹氫环锛�#鍏�/鍏枻");
curCheckData.foodVariety = foodVariety;
-
var index = layer.load();
+ console.log("flushCheckItem")
$.ajax({
type: "POST",
url: "../../basic/inout/get-check-item",
@@ -515,9 +446,11 @@
data: JSON.stringify(curCheckData),
success: function (result) {
if (result.code != "0000") {
+ console.log("flushCheckItem", "!==0000")
layer.msg(result.msg);
} else {
curCheckItems = result.data;
+ console.log("flushCheckItem", "==0000")
// 鏍规嵁鍖栭獙缁撴灉鎻愰啋鏄惁鍚堟牸
updateCheckResultTip();
// 椤甸潰娓叉煋妫�娴嬮」
@@ -526,10 +459,12 @@
}
},
error: function () {
+ console.log("flushCheckItem", "error")
layer.close(index);
layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
}
});
+ console.log("flushCheckItem", "end")
};
//浠呬繚瀛�
@@ -625,7 +560,7 @@
area: ['700px', '320px'],
shade: 0,
content: $('#scanCodeDetail'),
- success: function(layero, index){
+ success: function () {
document.getElementById('checkId').focus();
},
btnAlign: 'c',
@@ -643,7 +578,7 @@
//鏍规嵁璐ㄦ鍗曞彿鑾峰彇淇℃伅
function getDataByCheckId() {
var param = form.val("form-sacnCodeDetail");
- if(!param.checkId){
+ if (!param.checkId) {
layer.alert("璐ㄦ鍗曞彿涓虹┖锛岃鎵爜鎴栬緭鍏ヨ川妫�鍗曞彿");
}
var index = layer.load();
@@ -655,11 +590,13 @@
data: JSON.stringify(param),
success: function (result) {
if (result.code != "0000") {
+ console.log("success", "!=0000")
layer.close(index);
$("#form-sacnCodeDetail")[0].reset();
form.render();
notify(result.msg, result.data);
} else {
+ console.log("success", "==0000")
updateSelect();
showDetail(result.data);
}
@@ -668,7 +605,7 @@
layer.close(index);
$("#form-sacnCodeDetail")[0].reset();
form.render();
- layer.alert("淇濆瓨澶辫触锛岃閲嶆柊灏濊瘯锛�");
+ alertError("淇濆瓨澶辫触锛岃閲嶆柊灏濊瘯锛�")
}
});
}
--
Gitblit v1.9.3