From ad1bcdce9f8a4f2aed8ce6bee37ac2221d5136cf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 六月 2020 08:23:13 +0800
Subject: [PATCH] #
---
 src/main/webapp/views/pakStore/matQuery.html |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index dd63968..922a85a 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -60,11 +60,13 @@
 
 </body>
 <script>
+    var initCountVal = 1;
     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,14 +74,14 @@
             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',
             cols: [[
                 {type: 'checkbox', fixed: 'left'},
-                {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+                {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', sort: 'true'},
                 {field: 'barcode', align: 'center', title: '鏉$爜'},
                 {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
                 {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
@@ -105,12 +107,10 @@
                 if (res.code === 403) {
                     top.location.href = baseUrl + "/";
                 }
-                setMatCodeData(res.data);
                 $('td[data-field=count] div').html("1");
+                setMatCodeData(res.data);
             }
         });
-
-
 
         // 椤甸潰淇敼
         table.on('edit(matCode)', function (obj) {
@@ -125,7 +125,7 @@
             });
             searchData['orderByField'] = obj.field;
             searchData['orderByType'] = obj.type;
-            tableIns.reload({
+            matQueryTable.reload({
                 where: searchData,
                 page: {
                     curr: 1
@@ -145,6 +145,7 @@
             var checkStatus = table.checkStatus(obj.config.id);
             switch(obj.event) {
                 case 'confirm':
+                    parent.layer.close(parent.matCodeLayerIdx);
                     console.log(checkStatus);
                     break;
             }
@@ -164,14 +165,17 @@
         });
     })
 
-    function setMatCodeData(data, matNo, count) {
+    function setMatCodeData(data) {
         matCodeData = data;
+        for (var i=0;i<matCodeData.length;i++){
+            matCodeData[i]["count"] = initCountVal;
+        }
     }
 
     function updateMatCodeData(matNo, count) {
         for (var i=0;i<matCodeData.length;i++){
-            if (matCodeData[i][matNo] === matNo){
-                matCodeData[i][count] = count;
+            if (matCodeData[i]["matNo"] === matNo){
+                matCodeData[i]["count"] = count;
             }
         }
         console.log(matCodeData);
@@ -191,8 +195,8 @@
                 if (res.code === 403) {
                     top.location.href = baseUrl+"/";
                 }
-                setMatCodeData(res.data);
                 $('td[data-field=count] div').html("1");
+                setMatCodeData(res.data);
                 pageCurr=curr;
                 if (res.data.length === 0 && count !== 0) {
                     tableIns.reload({
--
Gitblit v1.9.1