From b3b2ac162add82f7fdf12d47f46c9c1bbc4c8def Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 29 六月 2020 09:16:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 103 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 8e39c1e..6750d53 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -43,8 +43,9 @@
padding: 6px 10px;
}
#code {
- width: 70%;
+ width: 75%;
height: 30px;
+ margin-right: 0;
}
header button {
height: 20px;
@@ -59,6 +60,10 @@
}
/* 涓讳綋 */
+ main {
+ height: 170px;
+ overflow: auto;
+ }
.layui-table, .layui-table-view {
margin: 0;
}
@@ -66,9 +71,16 @@
padding: 0;
}
.layui-table-cell {
+ height: 22px;
+ line-height: 22px;
padding: 0;
}
-
+ .layui-table-grid-down {
+ display: none;
+ }
+ .layui-table-body .layui-none {
+ /*height: 144px;*/
+ }
/* 灏鹃儴 */
footer {
position: absolute;
@@ -79,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>
@@ -86,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>
@@ -100,27 +119,27 @@
<!-- 灏鹃儴 -->
<footer>
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-xs">閲嶇疆</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs">缁勬墭</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>
<script>
+ var tableIns;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
tableIns = table.render({
elem: '#chooseData',
data: [],
- even: true,
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', field: 'count', title: '鏁伴噺', align: 'center', edit:'text', style:'color: blue;font-weight: bold', width:50},
+ {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:20},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
@@ -132,6 +151,7 @@
window.onload = function(){document.getElementById("code").focus();}
+ var matCodeLayerIdx;
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
@@ -145,5 +165,80 @@
}
});
}
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ 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) {
+ matData[j].count = Number(matData[j].count) + Number(data.count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tips("鎻愬彇鎴愬姛");
+ tableIns.reload({data: matData});
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#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