From c99a39f34856027216097a63188809a76acbfe12 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 17:09:41 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 6023f09..7b9c8a2 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -51,6 +51,13 @@
             width: 70px;
         }
 
+        /* layer */
+        .layui-layer-title {
+            font-size: 11px;
+            height: 20px;
+            line-height: 20px;
+        }
+
         /* 涓讳綋 */
         .layui-table, .layui-table-view {
             margin: 0;
@@ -61,7 +68,9 @@
         .layui-table-cell {
             padding: 0;
         }
-
+        .layui-table-grid-down {
+            display: none;
+        }
         /* 灏鹃儴 */
         footer {
             position: absolute;
@@ -99,11 +108,11 @@
 </footer>
 </body>
 <script>
+    var tableIns;
     layui.use(['table','laydate', 'form'], function() {
         var table = layui.table;
         var $ = layui.jquery;
         var layer = layui.layer;
-        var layDate = layui.laydate;
         var form = layui.form;
 
         tableIns = table.render({
@@ -113,9 +122,9 @@
             limit: 500,
             cellMinWidth: 50,
             cols: [[
-                {fixed: 'left', field: 'count', title: '鏁伴噺', align: 'center', edit:'text',  style:'color: blue;font-weight: bold', width:50},
                 {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
+                {fixed: 'left', field: 'count', title: '鏁伴噺', align: 'center', style:'color: blue', width:40}
             ]],
             done: function (res, curr, count) {
             }
@@ -123,17 +132,37 @@
 
     });
 
+    window.onload = function(){document.getElementById("code").focus();}
+
+    var matCodeLayerIdx;
     function getMat() {
         matCodeLayerIdx = layer.open({
             type: 2,
-            title: '鎻愬彇鐗╂枡',
-            maxmin: true,
-            area: [top.detailWidth, top.detailHeight],
-            shadeClose: true,
-            content: '../pakStore/matQuery.html',
+            title: '鐗╂枡',
+            shade: [0.3,'#000'],
+            area: ['90%', '90%'],
+            content: 'matQuery.html',
             success: function(layero, index){
+                $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
+                $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
             }
         });
     }
+
+    // 娣诲姞琛ㄦ牸鏁版嵁
+    var matData = [];
+    function addTableData(data) {
+        let toPush = true;
+        for (var j=0;j<matData.length;j++){
+            if (data.matNo === matData[j].matNo) {
+                matData[j].count = Number(matData[j].count) + Number(data.count);
+                toPush  = false;
+            }
+        }
+        if (toPush) {
+            matData.push(data);
+        }
+        tableIns.reload({data: matData});
+    }
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1