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 | 45 +++++++--
igds-web/src/main/resources/templates/admin/inout/out-card-back.html | 47 +++++++--
igds-web/src/main/resources/templates/admin/inout/out-handle.html | 87 +++++++++-------
igds-web/src/main/resources/templates/admin/inout/in-check.html | 72 +++++++------
4 files changed, 157 insertions(+), 94 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 54d4873..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
@@ -67,11 +67,21 @@
//鏄剧ず鍏ュ簱娴佺▼
showProgress();
});
+window.onbeforeunload = function () {
+ console.log('椤甸潰鍒锋柊涔嬪墠瑙﹀彂');
+}
+window.onunload = function () {
+ console.log('椤甸潰鍒锋柊瀹屾垚瑙﹀彂');
+}
window.onload = function () {
+
//鎵弿鏋嚜鍔ㄥ洖杞︿簨浠�
- $('#checkId').bind('keyup', function(event) {
+ $('#checkId').bind('keyup', function (event) {
if (event.keyCode == "13") {
+ // //鍘绘帀鐒︾偣锛岄槻姝㈠埛鏂伴〉闈�
+ // $('#checkId').blur();
+ console.log("in-check", "鎵爜鏋�");
getDataByCheckId();
}
});
@@ -175,6 +185,7 @@
});
form.render();
var data = form.val("form-detail");
+ console.log("getPriceByFoodLevel")
$.ajax({
type: "POST",
@@ -185,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 + "鍏�/鍏枻");
}
},
@@ -217,6 +230,7 @@
// var url = "com.ld.igds.inout.ReportInoutCheck.d";
// window.parent.openTab(url, "鍖栭獙缁撴灉瀵煎嚭", "checkDataExport");
};
+
// 鎵︽牱鏈鸿В闄ゆ�ュ仠
function checkResetStop() {
var param = JSON.stringify(checkDto);
@@ -274,6 +288,7 @@
* 娓叉煋琛ㄦ牸
*/
function renderTableCheckItem() {
+ console.log("renderTableCheckItem")
// 娓呯┖鏁版嵁
$("#tableCheckItem").empty();
table.render({
@@ -359,7 +374,6 @@
function showDetail(data) {
curCheckData = data;
-
if (!curCheckData.checkTime) {
curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
}
@@ -368,6 +382,7 @@
// 璧嬪��
form.val("form-detail", curCheckData);
form.render();
+ console.log("showDetail");
layer.open({
type: 1,
@@ -376,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);
@@ -417,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",
@@ -427,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();
// 椤甸潰娓叉煋妫�娴嬮」
@@ -438,10 +459,12 @@
}
},
error: function () {
+ console.log("flushCheckItem", "error")
layer.close(index);
layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
}
});
+ console.log("flushCheckItem", "end")
};
//浠呬繚瀛�
@@ -537,7 +560,7 @@
area: ['700px', '320px'],
shade: 0,
content: $('#scanCodeDetail'),
- success: function(){
+ success: function () {
document.getElementById('checkId').focus();
},
btnAlign: 'c',
@@ -555,7 +578,7 @@
//鏍规嵁璐ㄦ鍗曞彿鑾峰彇淇℃伅
function getDataByCheckId() {
var param = form.val("form-sacnCodeDetail");
- if(!param.checkId){
+ if (!param.checkId) {
layer.alert("璐ㄦ鍗曞彿涓虹┖锛岃鎵爜鎴栬緭鍏ヨ川妫�鍗曞彿");
}
var index = layer.load();
@@ -567,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);
}
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-check.html b/igds-web/src/main/resources/templates/admin/inout/in-check.html
index b7bb6a6..1bf048d 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-check.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-check.html
@@ -111,6 +111,7 @@
.input_ba {
background: #e7eaec !important;
}
+
.layui-layer-btn .layui-layer-btn1 {
border-color: #53adce;
background-color: #53adce;
@@ -130,29 +131,29 @@
<button type="button" class="rkbk-quick-btn layui-btn btn-violet" onclick="showScanCode()">
<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>鎵爜褰曞叆
</button>
-<!-- <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
-<!-- onclick="checkExe('big')">-->
-<!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>澶ц溅鎵︽牱-->
-<!-- </button>-->
+ <!-- <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
+ <!-- onclick="checkExe('big')">-->
+ <!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>澶ц溅鎵︽牱-->
+ <!-- </button>-->
-<!-- <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
-<!-- onclick="checkExe('small')">-->
-<!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>灏忚溅鎵︽牱-->
-<!-- </button>-->
+ <!-- <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
+ <!-- onclick="checkExe('small')">-->
+ <!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>灏忚溅鎵︽牱-->
+ <!-- </button>-->
-<!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
-<!-- onclick="checkReset()">-->
-<!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎵︽牱澶嶄綅-->
-<!-- </button>-->
+ <!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
+ <!-- onclick="checkReset()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎵︽牱澶嶄綅-->
+ <!-- </button>-->
-<!-- <button class="rkbk-quick-btn layui-btn btn-red"-->
-<!-- onclick="checkStop()">-->
-<!-- <i><img th:src="@{../../static/images/icon-stop.png}"/></i>鎵︽牱鎬ュ仠-->
-<!-- </button>-->
-<!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
-<!-- onclick="checkResetStop()">-->
-<!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎬ュ仠澶嶄綅-->
-<!-- </button>-->
+ <!-- <button class="rkbk-quick-btn layui-btn btn-red"-->
+ <!-- onclick="checkStop()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-stop.png}"/></i>鎵︽牱鎬ュ仠-->
+ <!-- </button>-->
+ <!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
+ <!-- onclick="checkResetStop()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎬ュ仠澶嶄綅-->
+ <!-- </button>-->
</div>
<!--娴佺▼寮曞-->
@@ -374,24 +375,27 @@
</body>
<!-- 鎵爜寮圭獥 -->
-<div class="layui-tab-content" id="scanCodeDetail" style="display: none;">
+<div class="layui-tab-content" id="scanCodeDetail" style="display: none;" 慰nsubmit="return false;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
- <form class="layui-form" id="form-sacnCodeDetail" lay-filter="form-sacnCodeDetail">
- <div class="layui-col-xs12">
- <div class="layui-form-item">
- <label class="layui-form-label">璐ㄦ鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" id="checkId" name="checkId" placeholder="璇锋壂鐮侊紝涔熷彲鎵嬪姩杈撳叆" class="layui-input">
- </div>
+ <form class="layui-form" id="form-sacnCodeDetail" lay-filter="form-sacnCodeDetail">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ㄦ鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" id="checkId" name="checkId" placeholder="璇锋壂鐮侊紝涔熷彲鎵嬪姩杈撳叆" class="layui-input">
+ <!--杩欒浠ｇ爜涓嶈兘鍒�-->
+ <!--褰揻orm琛ㄥ崟涓彧鏈変竴涓猧nput鏃舵寜鍥炶溅鎸夐敭浼氬埛鏂伴〉闈紝鍥犳娣诲姞涓�涓猧nput骞堕殣钘忥紝涓嶈兘浣跨敤type="hidden"鏂瑰紡闅愯棌-->
+ <input type="text" id="hiddenText" name="hiddenText" style="display:none"/>
</div>
</div>
+ </div>
- <div class="layui-col-xs12" style="margin-bottom: 10px">
- <div style="padding-left: 50px; color: #2ab5ad;">
- <span style="font-weight: bold; margin-right: 10px;">澶囨敞锛氳川妫�鍗曞彿鍙互鎵爜锛屼篃鍙互鎵嬪姩杈撳叆锛屾墜鍔ㄨ緭鍏ュ悗闇�瑕佺偣鍑绘煡璇�</span>
- </div>
+ <div class="layui-col-xs12" style="margin-bottom: 10px">
+ <div style="padding-left: 50px; color: #2ab5ad;">
+ <span style="font-weight: bold; margin-right: 10px;">澶囨敞锛氳川妫�鍗曞彿鍙互鎵爜锛屼篃鍙互鎵嬪姩杈撳叆锛屾墜鍔ㄨ緭鍏ュ悗闇�瑕佺偣鍑绘煡璇�</span>
</div>
- </form>
+ </div>
+ </form>
</div>
@@ -536,7 +540,7 @@
</blockquote>
</div>
<div class="layui-col-xs6">
- <blockquote class="layui-elem-quote" style="width: 95%;float: right;">
+ <blockquote class="layui-elem-quote" style="width: 95%;float: right;">
<div>
<span style="font-weight: bold; margin-right: 10px;">瀹氫环鍒ゅ畾锛�</span>
<span id="check-result-tip2" style="margin-right: 25px;">鏀剁伯鍗曚环锛�#鍏�/鍏枻</span>
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-card-back.html b/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
index 60cd451..a2c3fb0 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
@@ -262,29 +262,54 @@
</select>
</div>
</div>
-
<div class="layui-form-item">
- <label class="layui-form-label">绮鍝佺</label>
+ <label class="layui-form-label">鍑哄叆搴撶被鍨�</label>
<div class="layui-input-block">
- <select name="foodVariety" disabled>
- <option value="">鑷姩鑾峰彇</option>
- <option th:each="dic,dicSet:${listFoodVariety}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
+ <select name="type" disabled>
+ <option value="OUT">鍑哄簱浣滀笟</option>
+ <option value="IN">鍏ュ簱浣滀笟</option>
</select>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">绮绛夌骇</label>
+ <label class="layui-form-label">娴佺▼杩涘害</label>
<div class="layui-input-block">
- <select name="foodLevel" disabled>
- <option value="">鑷姩鑾峰彇</option>
- <option th:each="dic,dicSet:${listFoodLevel}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
+ <select name="progress" disabled>
+ <option value="REGISTER">鐧昏鐜妭</option>
+ <option value="CHECK">璐ㄦ鐜妭</option>
+ <option value="HANDLE">鍊间粨鐜妭</option>
+ <option value="WEIGHT_TAG">绉伴噸鐜妭</option>
+ <option value="WEIGHT_FULL">绉伴噸鐜妭</option>
+ <option value="WEIGHT_EMPTY">绉伴噸鐜妭</option>
+ <option value="CARD_BACK">绂诲簱纭</option>
+ <option value="RECORD">娴佺▼瀹屾垚</option>
</select>
</div>
</div>
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">绮鍝佺</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <select name="foodVariety" disabled>-->
+ <!-- <option value="">鑷姩鑾峰彇</option>-->
+ <!-- <option th:each="dic,dicSet:${listFoodVariety}"-->
+ <!-- th:value="${dic.code}" th:text="${dic.name}"></option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
+
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">绮绛夌骇</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <select name="foodLevel" disabled>-->
+ <!-- <option value="">鑷姩鑾峰彇</option>-->
+ <!-- <option th:each="dic,dicSet:${listFoodLevel}"-->
+ <!-- th:value="${dic.code}" th:text="${dic.name}"></option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
+
<div class="layui-form-item">
<label class="layui-form-label">寰�鏉ュ崟浣�</label>
<div class="layui-input-block">
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-handle.html b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
index ab4a51e..16c07ee 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
@@ -297,16 +297,16 @@
</div>
</div>
- <!-- <div class="layui-col-xs4">-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label">鍑� 閲�</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲缂栬緫"-->
- <!-- class="layui-input rkbk-search-input" disabled> <em-->
- <!-- class="kccz-data-dw">KG</em>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- </div>-->
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑� 閲�</label>
+ <div class="layui-input-block">
+ <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲缂栬緫"
+ class="layui-input rkbk-search-input" disabled> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
<!-- <div class="layui-col-xs4">-->
@@ -349,23 +349,23 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">璐ㄦ澧為噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
- </button>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input id="addCheck" type="text" name="addCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">璐ㄦ澧為噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏-->
+ <!-- </button>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input id="addCheck" type="text" name="addCheck" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
<!--<div class="layui-col-xs4">-->
<!-- <div class="layui-form-item kccz-data-group-md">-->
<!-- <label class="layui-form-label">姘村垎澧為噸</label>-->
@@ -406,22 +406,31 @@
</div>
</div>
<div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">璐ㄦ鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
- </button>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">绮浜у湴</label>
<div class="layui-input-block">
- <div class="posi-r">
- <input id="deCheck" type="text" name="deCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
+ <input type="text" name="foodLocation" placeholder="涓嶅彲缂栬緫"
+ autocomplete="off" class="layui-input" disabled="disabled">
</div>
</div>
</div>
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">璐ㄦ鎵ｉ噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏-->
+ <!-- </button>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input id="deCheck" type="text" name="deCheck" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
<!-- <div class="layui-col-xs4">-->
<!-- <div class="layui-form-item">-->
--
Gitblit v1.9.3