From 0b83d075e78acfded07fafe8da133376b2260ef6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 10:26:16 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStore/matQuery.html |   71 ++++++++---------------------------
 1 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index dd63968..84eb658 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>
@@ -56,15 +55,15 @@
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
 
 </body>
 <script>
-    var matCodeData = [];
+
     var pageCurr;
     layui.use(['table','laydate', 'form'], function() {
         var table = layui.table;
         var $ = layui.jquery;
+        var layer = layui.layer;
         var form = layui.form;
         // 鐗╂枡鏌ヨ鏁版嵁琛�
         matQueryTable = table.render({
@@ -72,8 +71,8 @@
             headers: {token: localStorage.getItem('token')},
             url: baseUrl + '/matCode/list/auth',
             page: true,
-            limit: 10,
-            limits: [10, 30,50,100],
+            limit: 7,
+            limits: [7, 10, 30,50,100],
             even: true,
             cellMinWidth: 50,
             toolbar: '#toolbar',
@@ -84,7 +83,6 @@
                 {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
                 {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
                 {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
-                {field: 'count', title: '鏁伴噺', align: 'center', edit:'text', width: 100}
             ]],
             request: {
                 pageName: 'curr',
@@ -105,47 +103,27 @@
                 if (res.code === 403) {
                     top.location.href = baseUrl + "/";
                 }
-                setMatCodeData(res.data);
-                $('td[data-field=count] div').html("1");
             }
-        });
-
-
-
-        // 椤甸潰淇敼
-        table.on('edit(matCode)', function (obj) {
-            updateMatCodeData(obj.data.matNo, Number(obj.value));
-        });
-
-        // 鐩戝惉鎺掑簭浜嬩欢
-        table.on('sort(matCode)', function (obj) {
-            var searchData = {};
-            $.each($('#search-box [name]').serializeArray(), function() {
-                searchData[this.name] = this.value;
-            });
-            searchData['orderByField'] = obj.field;
-            searchData['orderByType'] = obj.type;
-            tableIns.reload({
-                where: searchData,
-                page: {
-                    curr: 1
-                },
-                done: function (res, curr, count) {
-                    if (res.code === 403) {
-                        top.location.href = baseUrl+"/";
-                    }
-                    pageCurr=curr;
-                    limit();
-                }
-            });
         });
 
         // 鐩戝惉澶村伐鍏锋爮浜嬩欢
         table.on('toolbar(matCode)', function (obj) {
             var checkStatus = table.checkStatus(obj.config.id);
+            var data = checkStatus.data;
             switch(obj.event) {
                 case 'confirm':
-                    console.log(checkStatus);
+                    if (data.length === 0){
+                        layer.msg("璇烽�夋嫨鏁版嵁");
+                        return;
+                    }
+                    for (var i=0;i<data.length;i++){
+                        data[i]["count"] = parent.initCountVal;
+                    }
+
+
+                    parent.matCodeData.push.apply(parent.matCodeData, data);
+                    parent.tableIns.reload({data: parent.matCodeData});
+                    parent.layer.close(parent.matCodeLayerIdx);
                     break;
             }
         });
@@ -164,19 +142,6 @@
         });
     })
 
-    function setMatCodeData(data, matNo, count) {
-        matCodeData = data;
-    }
-
-    function updateMatCodeData(matNo, count) {
-        for (var i=0;i<matCodeData.length;i++){
-            if (matCodeData[i][matNo] === matNo){
-                matCodeData[i][count] = count;
-            }
-        }
-        console.log(matCodeData);
-    }
-
     function tableReload(child) {
         var searchData = {};
         $.each($('#search-box [name]').serializeArray(), function() {
@@ -191,8 +156,6 @@
                 if (res.code === 403) {
                     top.location.href = baseUrl+"/";
                 }
-                setMatCodeData(res.data);
-                $('td[data-field=count] div').html("1");
                 pageCurr=curr;
                 if (res.data.length === 0 && count !== 0) {
                     tableIns.reload({

--
Gitblit v1.9.1