From 07339fca4fe9f5263c2e74854e9ac5a0a9681d1c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 28 六月 2020 13:11:07 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pda/comb.html |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 7b9c8a2..3b0d801 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -43,8 +43,9 @@
             padding: 6px 10px;
         }
         #code {
-            width: 70%;
+            width: 75%;
             height: 30px;
+            margin-right: 0;
         }
         header button {
             height: 20px;
@@ -59,6 +60,10 @@
         }
 
         /* 涓讳綋 */
+        main {
+            height: 170px;
+            overflow: auto;
+        }
         .layui-table, .layui-table-view {
             margin: 0;
         }
@@ -66,10 +71,15 @@
             padding: 0;
         }
         .layui-table-cell {
+            height: 22px;
+            line-height: 22px;
             padding: 0;
         }
         .layui-table-grid-down {
             display: none;
+        }
+        .layui-table-body .layui-none {
+            /*height: 144px;*/
         }
         /* 灏鹃儴 */
         footer {
@@ -102,8 +112,8 @@
 <!-- 灏鹃儴 -->
 <footer>
     <div class="layui-btn-container">
-        <button type="button" class="layui-btn  layui-btn-xs">閲嶇疆</button>
-        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs">缁勬墭</button>
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">閲嶇疆</button>
+        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs" onclick="comb()" style="margin-left: 20px">缁勬墭</button>
     </div>
 </footer>
 </body>
@@ -118,13 +128,12 @@
         tableIns = table.render({
             elem: '#chooseData',
             data: [],
-            even: true,
             limit: 500,
             cellMinWidth: 50,
             cols: [[
+                {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:20},
                 {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
-                {fixed: 'left', field: 'count', title: '鏁伴噺', align: 'center', style:'color: blue', width:40}
+                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
             ]],
             done: function (res, curr, count) {
             }
@@ -164,5 +173,42 @@
         }
         tableIns.reload({data: matData});
     }
+
+    // 閲嶇疆
+    function reset() {
+        $('#code').val("");
+        matData = [];
+        tableIns.reload({data: matData});
+    }
+
+    // 缁勬墭
+    function comb() {
+        let barcode = $('#code').val();
+        if (isEmpty(barcode)) {
+            layer.msg("璇疯緭鍏ユ墭鐩樻潯鐮�");
+            return;
+        }
+        let combMats = matData;
+        $.ajax({
+            url: baseUrl+"/mobile/comb/auth",
+            headers: {'token': localStorage.getItem('token')},
+            data: JSON.stringify({
+                barcode: barcode,
+                combMats: combMats
+            }),
+            contentType:'application/json;charset=UTF-8',
+            method: 'POST',
+            asyne: false,
+            success: function (res) {
+                if (res.code === 200) {
+
+                } else if (res.code === 403) {
+                    top.location.href = baseUrl + "/pda";
+                } else {
+                    alert(res.msg)
+                }
+            }
+        })
+    }
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1