From 68ad4cf704c0a7c575936455d07e3e2f53fefbc4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 26 三月 2021 14:29:26 +0800
Subject: [PATCH] 1.0.5 1.小太阳需求改动

---
 src/main/webapp/views/pda/locNormalOut.html |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/pda/locNormalOut.html b/src/main/webapp/views/pda/locNormalOut.html
index aad7392..def0d04 100644
--- a/src/main/webapp/views/pda/locNormalOut.html
+++ b/src/main/webapp/views/pda/locNormalOut.html
@@ -48,13 +48,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>
@@ -87,7 +95,8 @@
     </div>
     <div class="form-item">
         <span>鍚嶇О</span>
-        <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled" readonly="readonly"></textarea>
+        <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">
@@ -110,7 +119,7 @@
     // 琛ㄦ牸鏁版嵁
     var normalOutList = [];
     window.onload = function () {
-        document.getElementById("matnr").focus();
+        document.getElementById("billNo").focus();
     }
 
     /**
@@ -216,11 +225,12 @@
 
     var warehouseBar;
     var matnrBar;
+    var billNo;
 
     /* 鎵爜銆佽緭鍏ュ簱鍖哄拰鐗╂枡缂栫爜 */
     function findCode(el, type) {
         warehouseBar = $('#uuid').val();
-        ;
+        billNo = $("#billNo").val();
         switch (type) {
             case 'uuid':
 //                exist('uuid', 'locArea');
@@ -233,12 +243,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',
@@ -348,7 +358,7 @@
                 if (res.code === 200) {
                     layer.msg("鍑哄簱鎴愬姛");
                     $("#matnr").val(null);
-//                    $("#uuid").val(null);
+                    $("#billNo").val(null);
                     warehouseBar = null;
                     matnrBar = null;
                     normalOutList = [];
@@ -367,6 +377,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