From b4a8d50e3d97fc9e893b554a60134e4eceb012eb Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 05 一月 2026 08:58:08 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/locNormalOut.html | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/views/pda/locNormalOut.html b/src/main/webapp/views/pda/locNormalOut.html
index aad7392..ab94a0d 100644
--- a/src/main/webapp/views/pda/locNormalOut.html
+++ b/src/main/webapp/views/pda/locNormalOut.html
@@ -12,6 +12,20 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
</head>
<style>
+ .form-box span {
+ font-size: 16px;
+ display: inline-block;
+ text-align: right;
+ }
+ .form-box input {
+ width: 165px;
+ padding-left: 5px;
+ height: 30px;
+ border: 1px solid #777777;
+ overflow:hidden;
+ white-space:nowrap;
+ text-overflow:ellipsis;
+ }
.number-tool {
margin-left: 10px;
padding: 1px 0 1px 5px;
@@ -48,13 +62,21 @@
<header class="layui-form">
<div class="layui-input-inline">
+ <label class="layui-form-label" style="margin-left: 32px">鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input id="billNo" class="layui-input" autocomplete="off" oninput="findCode(this, 'billNo')"
+ style="width: 175px">
+ </div>
+ </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%"
+ <input class="layui-input" id="matnr" onkeyup="findCode(this, 'matnr')" placeholder="鎵爜 / 杈撳叆"
+ style="width: 175px"
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">
+ <label class="layui-form-label" style="margin-left: 28px;">搴撳尯</label>
+ <div class="layui-input-inline" style="margin-left: 5px;width: 175px">
<select id="uuid" lay-filter="uuid">
<option value="">璇烽�夋嫨</option>
</select>
@@ -80,17 +102,36 @@
</footer>
<!-- 淇敼鏁伴噺寮圭獥 -->
-<div id="modify" style="display: none; text-align: center;padding-top: 10px">
- <div class="form-item">
- <span>缂栫爜</span>
- <input id="matnr2" type="text" disabled="disabled" style="width: 70%">
- </div>
- <div class="form-item">
- <span>鍚嶇О</span>
- <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled" readonly="readonly"></textarea>
+<div id="modify" style="display: none; padding-top: 10px; text-align: center;">
+ <div class="form-box">
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">缂栫爜</span>
+ </td>
+ <td style="text-align: left">
+ <input id="matnr2" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td style="vertical-align: top">
+ <span style="width: 35px; margin-right: 5px">鍚嶇О</span>
+ </td>
+ <td style="text-align: left">
+ <textarea rows="3" style="resize: none; width: 165px" id="maktx2" type="text" disabled="disabled"
+ readonly="readonly"></textarea>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
<input id="index" type="text" disabled="disabled" style="display: none;">
- <div class="form-item" style="margin-top: 5px; margin-bottom: 8px">
+ <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>
@@ -110,7 +151,7 @@
// 琛ㄦ牸鏁版嵁
var normalOutList = [];
window.onload = function () {
- document.getElementById("matnr").focus();
+ document.getElementById("billNo").focus();
}
/**
@@ -170,7 +211,7 @@
offset: '20px',
title: '淇敼鏁伴噺',
shadeClose: true,
- area: ['80%', '200px'],
+ area: ['80%', '240px'],
content: $("#modify"),
success: function (layero, index) {
$('#matnr2').val(data.matnr);
@@ -206,7 +247,7 @@
$('#uuid').append(html);
layui.form.render('select');
} else if (res.code === 403) {
- top.location.href = baseUrl + "/";
+ top.location.href = baseUrl + "/pda";
} else {
layer.msg(res.msg)
}
@@ -216,11 +257,15 @@
var warehouseBar;
var matnrBar;
+ var billNo;
/* 鎵爜銆佽緭鍏ュ簱鍖哄拰鐗╂枡缂栫爜 */
function findCode(el, type) {
warehouseBar = $('#uuid').val();
- ;
+ billNo = $("#billNo").val();
+ if (billNo && billNo != '' && billNo.indexOf('=') > -1) {
+ billNo = billNo.split(",")[0].split("=")[1];
+ }
switch (type) {
case 'uuid':
// exist('uuid', 'locArea');
@@ -233,12 +278,12 @@
}
// 鍒ゆ柇搴撳尯鎴栬�呯墿鏂欑紪鐮侀兘涓嶄负绌�
- if (!warehouseBar || !matnrBar) {
- return;
- }
+// if (!warehouseBar || !matnrBar) {
+// return;
+// }
$.ajax({
- url: baseUrl + "/locNormal/pda/out/query?matnr=" + matnrBar + "&warehouse=" + warehouseBar,
+ url: baseUrl + "/locNormal/pda/out/query?matnr=" + (matnrBar ? matnrBar : "") + "&warehouse=" + (warehouseBar ? warehouseBar : "") + "&billNo=" + (billNo ? billNo : ""),
headers: {'token': localStorage.getItem('token')},
// contentType: 'application/json;charset=UTF-8',
method: 'GET',
@@ -248,7 +293,7 @@
if (res.data && res.data.length > 0) {
res.data.map(function (item) {
// 榛樿璧嬪��0寮�濮�
- item.anfmeOut = 0;
+ item.anfmeOut = item.anfme;
});
}
tableIns.reload({
@@ -348,7 +393,7 @@
if (res.code === 200) {
layer.msg("鍑哄簱鎴愬姛");
$("#matnr").val(null);
-// $("#uuid").val(null);
+ $("#billNo").val(null);
warehouseBar = null;
matnrBar = null;
normalOutList = [];
@@ -367,6 +412,8 @@
function reset() {
$("#uuid").val(null);
$("#matnr").val(null);
+ $("#billNo").val(null);
+ layui.form.render('select');
normalOutList = [];
tableIns.reload({data: normalOutList});
layer.closeAll();
--
Gitblit v1.9.1