From 5d7bb61a5e12ff6512bb0fe26b221cd2084813ed Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 二月 2021 17:40:54 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockIn.html | 64 +++++++++-----------------------
1 files changed, 18 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index a7e5238..a8453b3 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -88,8 +88,7 @@
<footer>
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button id="empty-pakin" type="button" class="layui-btn layui-btn-normal" onclick="emptyPakIn()" style="margin-left: 15px">绌烘澘鍏ュ簱</button>
- <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">鍏ュ簱</button>
+ <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">涓婃灦</button>
</div>
</footer>
</body>
@@ -97,7 +96,6 @@
var tableIns;
window.onload = function(){
document.getElementById("code").focus();
- getInBound();
}
@@ -114,8 +112,8 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栫爜'},
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
@@ -138,7 +136,7 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- console.log(res.data);
+ addTableData(res.data)
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
@@ -154,29 +152,6 @@
$('#mat-btn').focus();
getMat();
}
- }
-
- // 鑾峰彇鍏ュ簱鍙�
- function getInBound(){
- $.ajax({
- url: baseUrl+"/available/put/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- var tpl = $("#putSiteSelectTemplate").html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- $('#putSiteSelect').append(html);
- layui.form.render('select');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/pda";
- }else {
- tips("鑾峰彇鍏ュ簱鍙ｅけ璐�", true)
- }
- }
- })
}
// 鎻愬彇鐗╂枡
@@ -200,22 +175,24 @@
// 娣诲姞琛ㄦ牸鏁版嵁
var matData = [];
function addTableData(data) {
- if (isEmpty(data.matName)){
- tips("鎻愬彇澶辫触", true);
- return;
+ if (matData.length > 0) {
+ matData = [];
}
- 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;
+ for (var i=0;i<data.length;i++) {
+ var toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data[i].matnr === matData[j].matnr) {
+ matData[j].count = Number(matData[j].count) + Number(data[i].anfme);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data[i]);
}
}
- if (toPush) {
- matData.push(data);
- }
- tips("鎻愬彇鎴愬姛");
+ // console.log(matData)
tableIns.reload({data: matData});
+ $("#comb-btn").focus();
}
// 閲嶇疆
@@ -335,10 +312,5 @@
$("#code").focus();
}
}
-</script>
-<script type="text/template" id="putSiteSelectTemplate">
- {{#each data}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1