From 64f12d06f306b0e68c7792df0eebc093c9f40e2f Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 20 三月 2021 08:18:50 +0800
Subject: [PATCH] 1.0.3 erp出库-发货通知

---
 src/main/webapp/views/pda/combPro.html |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 610e91e..83b94c9 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -61,7 +61,7 @@
     </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;">
+        <input class="layui-input" id="billNo" oninput="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
     </div>
 </header>
 
@@ -90,7 +90,7 @@
         <input id="matName" type="text" disabled="disabled" style="width: 70%">
     </div>
     <div class="form-item">
-        <span>鐢熸垚鍗曞彿</span>
+        <span>鐢熶骇鍗曞彿</span>
         <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
     </div>
     <div class="form-item" style="margin-top: 5px">
@@ -122,7 +122,7 @@
             cols: [[
                 {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
                 {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-                {field: 'warehouse', align: 'center', title: '鐢熸垚鍗曞彿'}
+                {field: 'warehouse', align: 'center', title: '鐢熶骇鍗曞彿'}
 //                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
             ]],
             done: function (res, curr, count) {
@@ -193,6 +193,10 @@
         if (isEmpty(billNo)) {
             return;
         }
+        // 璧嬪�煎墠娓呯┖琛ㄦ牸
+        matData = [];
+        tableIns.reload({data: matData});
+
         $.ajax({
             url: baseUrl + "/mobile/bill/query/auth",
             headers: {'token': localStorage.getItem('token')},
@@ -235,7 +239,7 @@
     function confirm(){
         var matNo = $('#matNo').val();
         var count = $('#count').val();
-        var warehouse = $("#warehouse").val();
+        var warehouse = $("#warehouse").val() === '' ? null : $("#warehouse").val();
         for (var j=0;j<matData.length;j++){
             if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
                 if (count > maxCount || count < minCount) {
@@ -253,7 +257,7 @@
     // 绉婚櫎鐗╂枡
     function remove() {
         var matNo = $('#matNo').val();
-        var warehouse = $("#warehouse").val();
+        var warehouse = $("#warehouse").val() === '' ? null : $("#warehouse").val();
         for (var j=0;j<matData.length;j++){
             if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
                 matData.splice(j, 1);

--
Gitblit v1.9.1