From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-web/src/main/resources/static/admin/inout/in-check.js | 160 +++++++++++++++++------------------------------------
1 files changed, 51 insertions(+), 109 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 01d5c04..47d1a88 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
@@ -29,6 +29,13 @@
});
laydate.render({
+ elem: '#foodYear',
+ theme: '#7b8e9f',
+ value: foodYear,
+ type: 'year'
+ });
+
+ laydate.render({
elem: '#checkTime',
theme: '#7b8e9f',
format: 'yyyy-MM-dd HH:mm:ss',
@@ -67,11 +74,18 @@
//鏄剧ず鍏ュ簱娴佺▼
showProgress();
});
+window.onbeforeunload = function () {
+}
+window.onunload = function () {
+}
window.onload = function () {
+
//鎵弿鏋嚜鍔ㄥ洖杞︿簨浠�
- $('#checkId').bind('keyup', function(event) {
+ $('#checkId').bind('keyup', function (event) {
if (event.keyCode == "13") {
+ // //鍘绘帀鐒︾偣锛岄槻姝㈠埛鏂伴〉闈�
+ // $('#checkId').blur();
getDataByCheckId();
}
});
@@ -117,7 +131,6 @@
var limit = data.upperLimit;
//杩愮畻绗�
var symbol = data.operaSymbol;
-
if (symbol && limit) {
if (">=" == symbol) {
if (newValue < limit) {
@@ -218,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);
@@ -318,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() {
@@ -441,7 +362,8 @@
title: '澶囨敞璇存槑',
align: 'center',
edit: 'text'
- }]]
+ }]],
+ limit: this.curCheckItems.length //鏄剧ず鐨勬暟閲�
});
$("thead tr").css({
@@ -452,7 +374,6 @@
function showDetail(data) {
curCheckData = data;
-
if (!curCheckData.checkTime) {
curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
}
@@ -469,14 +390,14 @@
shade: 0,
content: $('#checkDetail'),
btnAlign: 'c',
- btn: ['浠呬繚瀛�', '淇濆瓨鎻愪氦','鍏抽棴鍙栨秷'],
+ btn: ['浠呬繚瀛�', '淇濆瓨鎻愪氦', '鍏抽棴鍙栨秷'],
yes: function () {
// 鏇存柊鍒伴〉闈�
var data = form.val("form-detail");
// 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
Object.assign(curCheckData, data);
saveCheckData();
- if(scanCodeTag){
+ if (scanCodeTag) {
showScanCode();
}
}, btn2: function () {
@@ -485,18 +406,17 @@
// 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
Object.assign(curCheckData, data);
submit();
- if(scanCodeTag){
+ if (scanCodeTag) {
showScanCode();
}
}, btn3: function () {
parent.layer.closeAll();
- if(scanCodeTag){
+ if (scanCodeTag) {
showScanCode();
}
},
closeBtn: 0
});
-
// 鑾峰彇鍖栭獙椤逛俊鎭�
flushCheckItem(curCheckData.foodVariety);
getPriceByFoodLevel(curCheckData.foodLevel);
@@ -510,7 +430,6 @@
$("#check-result-tip").text("妫�楠岀粨鏋滐細#");
$("#price-result-tip2").text("绮瀹氫环锛�#鍏�/鍏枻");
curCheckData.foodVariety = foodVariety;
-
var index = layer.load();
$.ajax({
type: "POST",
@@ -572,6 +491,11 @@
//淇濆瓨鎻愪氦
function submit() {
+ console.log(curCheckData)
+ if (!curCheckData.sampleUser) {
+ layer.alert("璇峰厛鎵︽牱锛侊紒");
+ return;
+ }
if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
layer.alert("璇风‘璁ゅ寲楠岀粨鏋滐紒锛�");
return;
@@ -582,6 +506,10 @@
}
if (!curCheckData.foodLevel) {
layer.alert("璇风‘璁ょ伯椋熺瓑绾э紒锛�");
+ return;
+ }
+ if (!curCheckData.foodType) {
+ layer.alert("璇风‘璁ょ伯椋熸�ц川锛侊紒");
return;
}
if (!curCheckData.price) {
@@ -630,7 +558,7 @@
area: ['700px', '320px'],
shade: 0,
content: $('#scanCodeDetail'),
- success: function(){
+ success: function () {
document.getElementById('checkId').focus();
},
btnAlign: 'c',
@@ -648,7 +576,7 @@
//鏍规嵁璐ㄦ鍗曞彿鑾峰彇淇℃伅
function getDataByCheckId() {
var param = form.val("form-sacnCodeDetail");
- if(!param.checkId){
+ if (!param.checkId) {
layer.alert("璐ㄦ鍗曞彿涓虹┖锛岃鎵爜鎴栬緭鍏ヨ川妫�鍗曞彿");
}
var index = layer.load();
@@ -673,7 +601,7 @@
layer.close(index);
$("#form-sacnCodeDetail")[0].reset();
form.render();
- layer.alert("淇濆瓨澶辫触锛岃閲嶆柊灏濊瘯锛�");
+ alertError("淇濆瓨澶辫触锛岃閲嶆柊灏濊瘯锛�")
}
});
}
@@ -699,7 +627,7 @@
}, {
field: 'registerTime',
title: '鐧昏鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
}, {
field: 'sampleStatus',
@@ -724,12 +652,26 @@
}, {
field: 'sampleTime',
title: '鎵︽牱鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
+ }, {
+ field: 'foodType',
+ title: '绮鎬ц川',
+ width: '9%',
+ templet: function (item) {
+ var result = item.foodType;
+ $.each(listFoodType, function (index, data) {
+ if (item.foodType == data.code) {
+ result = data.name;
+ return true;
+ }
+ });
+ return result == null ? "" : result;
+ }
}, {
field: 'foodVariety',
title: '绮鍝佺',
- width: '11%',
+ width: '9%',
templet: function (item) {
var result = item.foodVariety;
$.each(listFoodVariety, function (index, data) {
@@ -743,7 +685,7 @@
}, {
field: 'depotId',
title: '瑁呭嵏浠撳簱',
- width: '11%',
+ width: '10%',
templet: function (item) {
var result = item.depotId;
$.each(listDepot, function (index, data) {
--
Gitblit v1.9.3