From 60a48ba8f8e82f35c3f6262c45eee00b70289c0e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 31 三月 2021 10:05:55 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/pakin.html | 256 +++++++++++++++++++++++++-------------------------
1 files changed, 127 insertions(+), 129 deletions(-)
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/pakin.html
similarity index 62%
rename from src/main/webapp/views/pda/combPro.html
rename to src/main/webapp/views/pda/pakin.html
index 5a47eb1..d1cf31b 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/pakin.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>缁勬墭</title>
+ <title>鍏ュ簱</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/pda.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -50,18 +50,29 @@
padding: 5px 20px;
color: darkred;
}
+
+ /**缁胯壊鍕�*/
+ #node-ok {
+ float: left;
+ width: 15px;
+ height: 15px;
+ border-radius: 50%;
+ margin-top: 13px;
+ background-color: #2ac845;
+ display: none;
+ }
</style>
</head>
<body>
<!-- 澶撮儴 -->
<header>
- <div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
- <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <div style="" class="layui-input-inline">
+ <label class="layui-form-label">鍏ュ簱璐т綅</label>
+ <input style="float: left" class="layui-input" type="text" id="node" onkeyup="findNode(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <span id="node-ok"></span>
</div>
- <div class="layui-input-inline" style="margin-top: 5px">
- <label class="layui-form-label">鍗曞彿</label>
- <input class="layui-input" id="billNo" onkeyup="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
+ <div style="margin: 5px 5px">
+ <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
</div>
</header>
@@ -73,20 +84,19 @@
<footer>
<div class="layui-btn-container">
<button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+ <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="pakin()" style="margin-left: 20px">鍏ュ簱</button>
<span id="tips"></span>
</div>
</footer>
-
<!-- 淇敼鏁伴噺寮圭獥 -->
<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>
@@ -99,9 +109,7 @@
</div>
</body>
<script>
- window.onload = function(){document.getElementById("code").focus();}
var tableIns;
- var countLayer;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -114,9 +122,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:'color: blue', width:50},
+ {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
}
@@ -135,8 +143,8 @@
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;
}
@@ -147,58 +155,114 @@
});
- function findCode(el) {
- if (el.value.length === 7) {
- $('#billNo').focus();
- }
- }
-
- // 娣诲姞琛ㄦ牸鏁版嵁
- 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();
- }
-
-
- /**
- * 鏍规嵁閫氱煡鍗曞彿鏌ヨ鐗╂枡璇︽儏
- */
- function find(el){
+ function findNode(el) {
if (isEmpty(el.value)) {
+ $('#node-ok').hide();
return;
}
$.ajax({
- url: baseUrl + "/mobile/bill/query/auth",
+ url: baseUrl + "/mobile/inStock/node/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- billNo: el.value
+ node: el.value
},
method: 'POST',
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- addTableData(res.data);
+ $('#node-ok').show();
+ } else {
+ $('#node-ok').hide();
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
- tips(res.msg, true)
+ tips(res.msg, true);
}
}
})
+ }
+
+ var matCodeLayerIdx;
+ function getMat() {
+ matCodeLayerIdx = layer.open({
+ type: 2,
+ title: '鎻愬彇鍟嗗搧',
+ shade: [0.3,'#000'],
+ area: ['90%', '80%'],
+ content: 'matQuery.html',
+ success: function(layero, index){
+ $('.layui-layer-title').css('font-size', '16px');
+ },
+ end: function () {
+ $('#mat-btn').focus();
+ }
+ });
+ }
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var matData = [];
+ function addTableData(data) {
+ if (isEmpty(data.maktx)){
+ tips("鎻愬彇澶辫触", true);
+ return;
+ }
+ var toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data.matnr === matData[j].matnr) {
+ matData[j].count = Number(matData[j].count) + Number(data.count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tips("鎻愬彇鎴愬姛");
+ tableIns.reload({data: matData});
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#node').val("");
+ matData = [];
+ tableIns.reload({data: matData});
+ $('#node-ok').hide();
+ }
+
+ // 鍏ュ簱
+ function pakin() {
+ layer.confirm('褰撳墠鐗╂枡寮�濮嬪叆搴擄紵', {shadeClose: true}, function(){
+ var node = $('#node').val();
+ if (isEmpty(node)) {
+ tips("璐т綅涓虹┖", true);
+ return;
+ }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/work/stock/pakin",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ nodeId: node,
+ mats: 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, true)
+ }
+ }
+ })
+ });
}
/************************************* 鏁伴噺 ****************************************/
@@ -206,9 +270,9 @@
var minCount = 1;
var maxCount = 1;
function add() {
- if (countDom.val() >= maxCount) {
- return;
- }
+ // if (countDom.val() >= maxCount) {
+ // return;
+ // }
countDom.val(Number(countDom.val()) + 1);
}
function reduce() {
@@ -220,11 +284,12 @@
// 淇敼鏁伴噺
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) {
+ if (matnr === matData[j].matnr) {
+ // if (count > maxCount || count < minCount) {
+ if (count < minCount) {
tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
return;
}
@@ -238,82 +303,15 @@
// 绉婚櫎鐗╂枡
function remove() {
- var matNo = $('#matNo').val();
+ var matnr = $('#matnr').val();
for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
+ if (matnr === matData[j].matnr) {
matData.splice(j, 1);
}
}
tableIns.reload({data: matData});
layer.close(countLayer);
tips("绉婚櫎鎴愬姛");
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- // 閲嶇疆
- function reset() {
- $('#code').val("");
- $('#billNo').val("");
- matData = [];
- tableIns.reload({data: matData});
- }
-
- // 缁勬墭
- function comb() {
- var barcode = $('#code').val();
- if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
- // document.getElementById("code").focus();
- return;
- }
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", true);
- return;
- }
- if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
- return;
- }
- var billNo = $('#billNo').val();
- $.ajax({
- url: baseUrl+"/mobile/comb/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- barcode: barcode,
- combMats: matData,
- billNo: billNo
- }),
- 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, true)
- }
- }
- })
}
/**
@@ -333,8 +331,8 @@
$("#comb-btn").focus();
comb();
} else if (key === 113) {
- $("#code").val("");
- $("#code").focus();
+ $("#node").val("");
+ $("#node").focus();
}
}
</script>
--
Gitblit v1.9.1