From 2e3d5cf70eb44b58cbc2b068269e2b332721ca81 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 28 六月 2020 15:02:41 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index c6c36e9..6750d53 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>
@@ -112,8 +119,9 @@
<!-- 灏鹃儴 -->
<footer>
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-xs" onclick="reset()">閲嶇疆</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="comb">缁勬墭</button>
+ <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});
}
@@ -179,11 +192,53 @@
$('#code').val("");
matData = [];
tableIns.reload({data: matData});
+ tips("");
}
// 缁勬墭
function comb() {
+ let barcode = $('#code').val();
+ if (isEmpty(barcode)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ document.getElementById("code").focus();
+ return;
+ }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/mobile/comb/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ barcode: barcode,
+ combMats: matData
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("缁勬墭鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ 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