From 6c2a688389a9b709dfd4c1b826d11a6358a8d7ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 六月 2020 09:20:05 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/report/locDetl.html      |    2 +-
 src/main/webapp/views/pakStore/pakStore.html   |    7 ++-----
 src/main/webapp/static/js/pakStore/pakStore.js |   16 ++++++++++++++++
 src/main/webapp/views/pakStore/matQuery.html   |    2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index ad5f908..f9f16a1 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -5,6 +5,22 @@
     var layDate = layui.laydate;
     var form = layui.form;
 
+    tableIns = table.render({
+        elem: '#chooseData',
+        even: true,
+        cellMinWidth: 50,
+        cols: [[
+            {type: 'checkbox', fixed: 'left'},
+            {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', sort: 'true'},
+            {field: 'barcode', align: 'center', title: '鏉$爜'},
+            {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
+            {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
+            {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
+            {field: 'count', title: '鏁伴噺', align: 'center', edit:'text', width: 100}
+        ]],
+        done: function (res, curr, count) {
+        }
+    });
 
 });
 
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index abdfab1..3e9fcb0 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -46,7 +46,6 @@
     </div>
 </script>
 
-
 <div class="layui-form">
     <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
 </div>
@@ -157,6 +156,7 @@
                         }
                     }
                     parent.layer.close(parent.matCodeLayerIdx);
+                    parent.tableIns.reload({data: matCodeData})
                     break;
             }
         });
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 0af0b0c..6354ad7 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -52,12 +52,9 @@
 <hr>
 
 <!-- 琛ㄦ牸 -->
-<div style="height: 500px">
-
+<div style="">
+    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
 </div>
-
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index ea6ba2b..c7dfb83 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -44,7 +44,7 @@
             headers: {token: localStorage.getItem('token')},
             url: baseUrl+'/locDetl/list/auth',
             page: true,
-            limit: 5,
+            limit: 10,
             skin: 'line',
             where: {loc_no: parent.locNo},
             even: true,

--
Gitblit v1.9.1