From f2beaeeb5a1811dbc38b386d7a5b5d0f9c8c6f7c Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 08:42:25 +0800
Subject: [PATCH] 1.0.3 pda新增平仓出库功能

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

diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 5952267..7ad5d90 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -74,6 +74,7 @@
     <div class="layui-btn-container">
         <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
         <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+        <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" style="margin-left: 20px">杩斿洖</button>
         <span id="tips"></span>
     </div>
 </footer>
@@ -97,6 +98,24 @@
     <button id="remove" onclick="remove()">绉婚櫎</button>
     <button id="confirm" onclick="confirm()">淇濆瓨</button>
 </div>
+
+<!-- 鏄剧ず鐢熸垚鍗曞彿寮圭獥 -->
+<div id="warehouseModal" style="display: none; text-align: center; padding-top: 10px">
+    <div class="form-item">
+        <span>鐗╂枡</span>
+        <input id="matNo2" type="text" disabled="disabled" style="width: 70%">
+    </div>
+    <div class="form-item">
+        <span>鍚嶇О</span>
+        <input id="matName2" type="text" disabled="disabled" style="width: 70%">
+    </div>
+    <div class="form-item">
+        <span>鐢熸垚鍗曞彿</span>
+        <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
+    </div>
+    <button onclick="closeWarehouse()" style="margin-top: 8px">鍏抽棴</button>
+</div>
+
 </body>
 <script>
     window.onload = function(){document.getElementById("code").focus();}
@@ -115,7 +134,7 @@
             cellMinWidth: 50,
             cols: [[
                 {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
-                {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+                {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', event: 'warehouse', style: 'cursor: pointer;color: blue'},
                 {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
             ]],
             done: function (res, curr, count) {
@@ -142,10 +161,30 @@
                         }
                     });
                     break;
+                case 'warehouse':
+                    layer.open({
+                        type: 1,
+                        offset: '20px',
+                        title: '鐢熸垚鍗曞彿鏄庣粏',
+                        shadeClose: true,
+                        area: ['80%', '180px'],
+                        content: $("#warehouseModal"),
+                        success: function (layero, index) {
+                            $('#matNo2').val(data.matNo);
+                            $('#matName2').val(data.matName);
+                            $('#warehouse').val(data.warehouse);
+                        }
+                    });
+                    break;
             }
         });
 
     });
+
+    /* 鍏抽棴鐢熸垚鍗曞彿鏄庣粏 */
+    function closeWarehouse() {
+        layer.closeAll();
+    }
 
     function findCode(el) {
         if (el.value.length === 7) {
@@ -181,6 +220,9 @@
             return;
         }
         var billNo = el.value.split(",")[0].split("=")[1];
+        if (isEmpty(billNo)) {
+            return;
+        }
         $.ajax({
             url: baseUrl + "/mobile/bill/query/auth",
             headers: {'token': localStorage.getItem('token')},
@@ -338,5 +380,9 @@
             $("#code").focus();
         }
     }
+
+    function back() {
+        parent.backIndex();
+    }
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1