From 471b03ba06439af15d23bfcfb72a457f6cd1bf8f Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 29 三月 2021 10:23:31 +0800
Subject: [PATCH] 1.0.5 入库通知档案-状态运行中改为“已处理”、增加托盘码条码检索条件
---
src/main/webapp/views/pda/locNormalIn.html | 124 +++++++++++++++++++++++++++++++++--------
1 files changed, 100 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index f91e840..6de0418 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -6,6 +6,7 @@
<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>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
@@ -17,12 +18,23 @@
</head>
<body>
<!-- 澶撮儴 -->
-<header>
+<header class="layui-form">
+ <div>
+ <div class="layui-input-inline">
+ <label class="layui-form-label">鍗曞彿</label>
+ <div class="layui-input-inline" style="width: 175px">
+ <input id="billNo" class="layui-input" autocomplete="off" oninput="find(this)">
+ </div>
+ </div>
+ </div>
<div>
<div class="layui-input-inline">
<label class="layui-form-label">搴撳尯</label>
- <input class="layui-input" type="number" id="warehouse" onkeyup="findCode(this)" placeholder="鎵爜 / 杈撳叆"
- autocomplete="off">
+ <div class="layui-input-inline" style="width: 175px">
+ <select id="uuid">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </div>
</div>
</div>
@@ -59,6 +71,8 @@
var layer = layui.layer;
var form = layui.form;
+ document.getElementById("billNo").focus();
+
tableIns = table.render({
elem: '#chooseData',
data: [],
@@ -73,17 +87,33 @@
}
});
+ 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)
+ }
+ }
+ });
});
window.onload = function () {
- document.getElementById("warehouse").focus();
- }
-
- function findCode(el) {
- if (el.value.length === 7) {
- $('#mat-btn').focus();
- getMat();
- }
+ document.getElementById("uuid").focus();
}
var matCodeLayerIdx;
@@ -126,19 +156,13 @@
tableIns.reload({data: matData});
}
- // 閲嶇疆
- function reset() {
- $('#warehouse').val("");
- matData = [];
- tableIns.reload({data: matData});
- }
-
// 缁勬墭
function comb() {
- let barcode = $('#warehouse').val();
+ let barcode = $('#uuid').val();
+ console.log('barcode', barcode);
if (isEmpty(barcode)) {
- tips("搴撳尯鏉＄爜涓虹┖", true);
- document.getElementById("warehouse").focus();
+ tips("璇烽�夋嫨搴撳尯", true);
+ document.getElementById("uuid").focus();
return;
}
if (matData.length === 0) {
@@ -154,6 +178,11 @@
maktx: item.matName,
anfme: item.count,
warehouse: barcode,
+ mnemonic: item.mnemonic,
+ supplier: item.supplier,
+ lgnum: item.lgnum,
+ type: item.type,
+ altme: item.altme,
});
});
@@ -169,7 +198,7 @@
async: false,
success: function (res) {
if (res.code === 200) {
- reset();
+ reset(true);
tips("缁勬墭鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
@@ -178,8 +207,45 @@
}
},
});
+ }
+ /**
+ * 鏍规嵁閫氱煡鍗曞彿鏌ヨ鐗╂枡璇︽儏
+ */
+ function find(el) {
+ var billNo = el.value;
+ if (isEmpty(billNo)) {
+ return;
+ }
+ // 璧嬪�煎墠娓呯┖琛ㄦ牸
+ matData = [];
+ tableIns.reload({data: matData});
+ $.ajax({
+ url: baseUrl + "/mobile/bill/query/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ billNo: billNo
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data != null) {
+ console.log('鍗曞彿鏁版嵁', res.data);
+ var data = res.data;
+ if (data.length > 0) {
+ for (var i = 0; i < data.length; i++) {
+ addTableData(data[i]);
+ }
+ }
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ });
}
/**
@@ -202,13 +268,23 @@
$("#comb-btn").focus();
comb();
} else if (key === 113) {
- $("#warehouse").val("");
- $("#warehouse").focus();
+ $("#uuid").val("");
+ $("#uuid").focus();
}
}
function back() {
parent.backIndex();
}
+
+ // 閲嶇疆
+ function reset() {
+ matData = [];
+ tableIns.reload({data: matData});
+ layer.closeAll();
+ $("#billNo").val("");
+ $("#uuid").val("");
+ layui.form.render('select');
+ }
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1