From 55ca2718c3764c7d6127dc49c13bb31a5d998559 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 三月 2021 09:40:15 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockCheck.html | 107 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 55 deletions(-)
diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index 3fc9f20..2a86ad6 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -59,6 +59,9 @@
<label class="layui-form-label">璐т綅</label>
<input class="layui-input" id="locNo" onkeyup="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
</div>
+ <div style="margin: 5px 5px">
+ <button id="replenish-btn" type="button" class="layui-btn layui-btn-normal" onclick="replenish()"><i class="layui-icon">+</i>琛ュ厖</button>
+ </div>
</header>
<!-- 涓讳綋 -->
@@ -78,11 +81,11 @@
<div id="modify" style="display: none; text-align: center;padding-top: 10px">
<div class="form-item">
<span>鐗╂枡</span>
- <input id="matNo" type="text" disabled="disabled" style="width: 70%">
+ <input id="matnr" type="text" disabled="disabled" style="width: 70%">
</div>
<div class="form-item">
<span>鍚嶇О</span>
- <input id="matName" type="text" disabled="disabled" style="width: 70%">
+ <input id="maktx" type="text" disabled="disabled" style="width: 70%">
</div>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -97,7 +100,7 @@
<script>
window.onload = function(){document.getElementById("locNo").focus();}
var tableIns;
- var countLayer;
+ var anfmeLayer;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -110,9 +113,9 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'font-weight: bold;', width:50},
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿', event: 'modify'},
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О', event: 'modify'}
]],
done: function (res, curr, count) {
}
@@ -123,7 +126,7 @@
var data = obj.data;
switch (obj.event) {
case 'modify':
- countLayer = layer.open({
+ anfmeLayer = layer.open({
type: 1,
offset: '20px',
title: '淇敼鏁伴噺',
@@ -131,10 +134,9 @@
area: ['80%', '200px'],
content: $("#modify"),
success: function (layero, index) {
- $('#matNo').val(data.matNo);
- $('#matName').val(data.matName);
+ $('#matnr').val(data.matnr);
+ $('#maktx').val(data.maktx);
$('#count').val(data.count);
- maxCount = data.count;
}
});
break;
@@ -142,26 +144,6 @@
});
});
-
- // 娣诲姞琛ㄦ牸鏁版嵁
- var matData = [];
- function addTableData(data) {
- for (var i=0;i<data.length;i++) {
- var toPush = true;
- for (var j=0;j<matData.length;j++){
- if (data[i].matNo === matData[j].matNo) {
- matData[j].count = Number(matData[j].count) + Number(data[i].count);
- toPush = false;
- }
- }
- if (toPush) {
- matData.push(data[i]);
- }
- }
- tableIns.reload({data: matData});
- // $("#comb-btn").focus();
- }
-
/**
* 鏍规嵁閫氱煡鍗曞彿鏌ヨ鐗╂枡璇︽儏
@@ -180,6 +162,7 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
+ locDetlData = [];
addTableData(res.data);
}
} else if (res.code === 403) {
@@ -191,14 +174,29 @@
})
}
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var locDetlData = [];
+ function addTableData(data) {
+ for (var i=0;i<data.length;i++) {
+ var toPush = true;
+ for (var j=0;j<locDetlData.length;j++){
+ if (data[i].matnr === locDetlData[j].matnr) {
+ // locDetlData[j].anfme = Number(locDetlData[j].anfme) + Number(data[i].anfme);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ locDetlData.push(data[i]);
+ }
+ }
+ tableIns.reload({data: locDetlData});
+ // $("#comb-btn").focus();
+ }
+
/************************************* 鏁伴噺 ****************************************/
var countDom = $('#count');
- var minCount = 1;
- var maxCount = 1;
+ var minCount = 0;
function add() {
- if (countDom.val() >= maxCount) {
- return;
- }
countDom.val(Number(countDom.val()) + 1);
}
function reduce() {
@@ -210,32 +208,32 @@
// 淇敼鏁伴噺
function confirm(){
- var matNo = $('#matNo').val();
+ var matnr = $('#matnr').val();
var count = $('#count').val();
- for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
- if (count > maxCount || count < minCount) {
- tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
+ for (var j=0;j<locDetlData.length;j++){
+ if (matnr === locDetlData[j].matnr) {
+ if (count < minCount) {
+ tips("鏁伴噺蹇呴』澶т簬0", true);
return;
}
- matData[j].count = Number(count);
+ locDetlData[j].count = Number(count);
}
}
- tableIns.reload({data: matData});
- layer.close(countLayer);
+ tableIns.reload({data: locDetlData});
+ layer.close(anfmeLayer);
tips("淇敼鎴愬姛");
}
// 绉婚櫎鐗╂枡
function remove() {
- var matNo = $('#matNo').val();
- for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
- matData.splice(j, 1);
+ var matnr = $('#matnr').val();
+ for (var j=0;j<locDetlData.length;j++){
+ if (matnr === locDetlData[j].matnr) {
+ locDetlData.splice(j, 1);
}
}
- tableIns.reload({data: matData});
- layer.close(countLayer);
+ tableIns.reload({data: locDetlData});
+ layer.close(anfmeLayer);
tips("绉婚櫎鎴愬姛");
}
@@ -259,10 +257,9 @@
// 閲嶇疆
function reset() {
- $('#code').val("");
- $('#billNo').val("");
- matData = [];
- tableIns.reload({data: matData});
+ $('#locNo').val("");
+ locDetlData = [];
+ tableIns.reload({data: locDetlData});
}
// 缁勬墭
@@ -277,7 +274,7 @@
tips("鏉＄爜蹇呴』涓�7浣�", true);
return;
}
- if (matData.length === 0) {
+ if (locDetlData.length === 0) {
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
@@ -287,7 +284,7 @@
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
barcode: barcode,
- combMats: matData,
+ combMats: locDetlData,
billNo: billNo
}),
contentType:'application/json;charset=UTF-8',
--
Gitblit v1.9.1