From 146b8f6de97db4dcab12736fc1549cbe497c0b95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 28 六月 2020 14:31:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 3b0d801..b65a56f 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -91,6 +91,13 @@
margin-left: 10px;
margin-bottom: 2px;
}
+ #tips {
+ display: inline-block;
+ color: #666;
+ margin-left: 5px;
+ margin-bottom: 5px;
+ vertical-align: middle;
+ }
</style>
</head>
<body>
@@ -98,7 +105,7 @@
<header>
<div class="layui-input-inline">
<label class="layui-form-label">鏉＄爜</label>
- <input class="layui-input" type="text" id="code" placeholder="鎵爜/杈撳叆" autocomplete="off">
+ <input class="layui-input" type="text" id="code" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
<div style="margin: 5px 5px">
<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
@@ -114,6 +121,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">閲嶇疆</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+ <span id="tips"></span>
</div>
</footer>
</body>
@@ -161,6 +169,10 @@
// 娣诲姞琛ㄦ牸鏁版嵁
var matData = [];
function addTableData(data) {
+ if (isEmpty(data.matName)){
+ tips("鎻愬彇澶辫触");
+ return;
+ }
let toPush = true;
for (var j=0;j<matData.length;j++){
if (data.matNo === matData[j].matNo) {
@@ -171,6 +183,7 @@
if (toPush) {
matData.push(data);
}
+ tips("鎻愬彇鎴愬姛");
tableIns.reload({data: matData});
}
@@ -185,30 +198,46 @@
function comb() {
let barcode = $('#code').val();
if (isEmpty(barcode)) {
- layer.msg("璇疯緭鍏ユ墭鐩樻潯鐮�");
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ document.getElementById("code").focus();
return;
}
- let combMats = matData;
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
$.ajax({
url: baseUrl+"/mobile/comb/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
barcode: barcode,
- combMats: combMats
+ combMats: matData
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
- asyne: false,
+ async: false,
success: function (res) {
if (res.code === 200) {
-
+ reset();
+ tips("缁勬墭鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
- alert(res.msg)
+ tips(res.msg)
}
}
})
}
+
+ /**
+ * 鎻愮ず淇℃伅
+ * @param msg 鎻愮ず鍐呭
+ * @param warn true锛氱孩鑹插瓧浣�
+ */
+ function tips(msg, warn) {
+ let tips = $('#tips');
+ tips.html(msg);
+ tips.css("color", warn?"red":'#666');
+ }
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1