From 960d4eff85f99f138eda0ac360d2870882156a47 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 25 三月 2021 10:47:16 +0800
Subject: [PATCH] 1.0.5 1.小太阳需求改动
---
src/main/webapp/views/pda/locNormalOut.html | 114 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/views/pda/locNormalOut.html b/src/main/webapp/views/pda/locNormalOut.html
index 9a1e3ff..aad7392 100644
--- a/src/main/webapp/views/pda/locNormalOut.html
+++ b/src/main/webapp/views/pda/locNormalOut.html
@@ -18,11 +18,13 @@
display: inline-block;
width: 120px;
}
+
.number-tool:after {
clear: both;
content: "";
display: table;
}
+
.number-tool button {
background-color: #fff;
margin-top: 3px;
@@ -32,6 +34,7 @@
width: 25px;
border: 1px solid #777777;
}
+
.number-tool input {
text-align: center;
height: 30px;
@@ -43,20 +46,20 @@
</style>
<body>
-<header>
- <div>
- <div class="layui-input-inline">
- <label class="layui-form-label" style="margin-left: 32px">搴撳尯</label>
- <input class="layui-input" id="uuid" onkeyup="findCode(this, 'uuid')" placeholder="鎵爜 / 杈撳叆"
- autocomplete="off">
- </div>
- <div class="layui-input-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <input class="layui-input" id="matnr" onkeyup="findCode(this, 'matnr')" placeholder="鎵爜 / 杈撳叆" style="width: 65%"
- autocomplete="off">
+<header class="layui-form">
+ <div class="layui-input-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <input class="layui-input" id="matnr" onkeyup="findCode(this, 'matnr')" placeholder="鎵爜 / 杈撳叆" style="width: 65%"
+ autocomplete="off">
+ </div>
+ <div class="layui-input-inline">
+ <label class="layui-form-label" style="margin-left: 28px">搴撳尯</label>
+ <div class="layui-input-inline" style="margin-left: 5px;width: 180px">
+ <select id="uuid" lay-filter="uuid">
+ <option value="">璇烽�夋嫨</option>
+ </select>
</div>
</div>
-
</header>
<main>
@@ -84,13 +87,15 @@
</div>
<div class="form-item">
<span>鍚嶇О</span>
- <input id="maktx2" type="text" disabled="disabled" style="width: 70%">
+ <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled" readonly="readonly"></textarea>
</div>
<input id="index" type="text" disabled="disabled" style="display: none;">
<div class="form-item" style="margin-top: 5px; margin-bottom: 8px">
<span style="vertical-align: middle">鏁伴噺</span>
<div class="number-tool" style="vertical-align: middle">
- <button onclick="reduce()">-</button><input id="anfme2" type="number" onchange="fix(this)"><button onclick="add()">+</button>
+ <button onclick="reduce()">-</button>
+ <input id="anfme2" type="number" onchange="fix(this)">
+ <button onclick="add()">+</button>
</div>
</div>
<button id="remove" onclick="remove()">绉婚櫎</button>
@@ -105,7 +110,7 @@
// 琛ㄦ牸鏁版嵁
var normalOutList = [];
window.onload = function () {
- document.getElementById("uuid").focus();
+ document.getElementById("matnr").focus();
}
/**
@@ -114,7 +119,7 @@
* @param warn true锛氱孩鑹插瓧浣�
*/
function tips(msg, warn) {
- layer.msg(msg, {icon: warn?2:1})
+ layer.msg(msg, {icon: warn ? 2 : 1})
}
function back() {
@@ -122,7 +127,7 @@
}
var tableIns;
- layui.use(['table','laydate', 'form'], function() {
+ layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -135,11 +140,20 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left', width:30},
- {field: 'anfmeOut', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', event: 'modify', style:'cursor: pointer;color: blue', width:50},
- {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail', width:80},
+ {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail', width: 80},
{field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
- {field: 'warehouse', align: 'center', title: '搴撳尯', event: 'detail', width:50}
+ {field: 'warehouse', align: 'center', title: '搴撳尯', event: 'detail', width: 50},
+ {
+ field: 'anfmeOut',
+ align: 'center',
+ title: '鏁伴噺',
+ event: 'detail',
+ style: 'color: blue',
+ event: 'modify',
+ style: 'cursor: pointer;color: blue',
+ width: 50
+ },
+ {type: 'checkbox', fixed: 'right', width: 30},
]],
done: function (res, curr, count) {
}
@@ -147,7 +161,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(locNormalOut)', function(obj) {
+ table.on('tool(locNormalOut)', function (obj) {
var data = obj.data;
switch (obj.event) {
case 'modify':
@@ -169,19 +183,50 @@
break;
}
});
+
+ form.on('select(uuid)', function (data) {
+ var val = data.value;
+ findCode(this, 'uuid');
+ });
+
+ var areaType = getQueryVariable('areaType');
+ // 鑾峰彇浠撳簱涓嬫媺
+ $.ajax({
+ url: baseUrl + "/locArea/queryAll/auth?areaType=" + (areaType ? areaType : ""),
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var html = "";
+ if (res.data && res.data.length > 0) {
+ html += res.data.map(function (item) {
+ return "<Option value=" + item.uuid + ">" + item.name + "</Option>";
+ });
+ }
+ $('#uuid').append(html);
+ layui.form.render('select');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
});
var warehouseBar;
var matnrBar;
+
/* 鎵爜銆佽緭鍏ュ簱鍖哄拰鐗╂枡缂栫爜 */
function findCode(el, type) {
+ warehouseBar = $('#uuid').val();
+ ;
switch (type) {
case 'uuid':
- warehouseBar = el.value;
- exist('uuid', 'locArea');
+// exist('uuid', 'locArea');
break;
case 'matnr':
- matnrBar = el.value;
+ matnrBar = el.value;
break;
default:
break;
@@ -193,7 +238,7 @@
}
$.ajax({
- url: baseUrl + "/locNormal/pda/out/query?matnr="+matnrBar+"&warehouse="+warehouseBar,
+ url: baseUrl + "/locNormal/pda/out/query?matnr=" + matnrBar + "&warehouse=" + warehouseBar,
headers: {'token': localStorage.getItem('token')},
// contentType: 'application/json;charset=UTF-8',
method: 'GET',
@@ -203,7 +248,7 @@
if (res.data && res.data.length > 0) {
res.data.map(function (item) {
// 榛樿璧嬪��0寮�濮�
- item.anfmeOut = 0;
+ item.anfmeOut = 0;
});
}
tableIns.reload({
@@ -221,27 +266,31 @@
/* 淇敼鏁伴噺 */
var countDom = $('#anfme2');
+
function add() {
if (countDom.val() >= maxCount) {
return;
}
countDom.val(Number(countDom.val()) + 1);
}
+
function reduce() {
if (countDom.val() <= 0) {
return;
}
countDom.val(Number(countDom.val()) - 1);
}
+
function fix(e) {
if (Number(e.value) > maxCount) {
countDom.val(maxCount);
}
}
+
function remove() {
var matnr = $('#matnr2').val();
var index = $('#index').val();
- for (var j=0;j<normalOutList.length;j++){
+ for (var j = 0; j < normalOutList.length; j++) {
if (matnr === normalOutList[j].matnr && index == normalOutList[j].id) {
normalOutList.splice(j, 1);
}
@@ -250,12 +299,13 @@
layer.close(countLayer);
tips("绉婚櫎鎴愬姛");
}
+
// 淇敼鏁伴噺
- function confirm(){
+ function confirm() {
var matnr = $('#matnr2').val();
var count = $('#anfme2').val();
var index = $('#index').val();
- for (var j=0;j<normalOutList.length;j++){
+ for (var j = 0; j < normalOutList.length; j++) {
if (matnr === normalOutList[j].matnr && index == normalOutList[j].id) {
if (count > maxCount || count < 0) {
tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
@@ -282,7 +332,7 @@
// 搴撳尯璧嬪��
var warehouse = $('#uuid').val();
data.map(function (item) {
- item.warehouse = warehouse;
+ item.warehouse = warehouse;
});
// 鍑哄簱鎺ュ彛
$.ajax({
@@ -298,7 +348,7 @@
if (res.code === 200) {
layer.msg("鍑哄簱鎴愬姛");
$("#matnr").val(null);
- $("#uuid").val(null);
+// $("#uuid").val(null);
warehouseBar = null;
matnrBar = null;
normalOutList = [];
--
Gitblit v1.9.1