From e2461a48bfce4f9f3660c2bb70bff71f86210f6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 六月 2020 08:38:36 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStore/matQuery.html |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 65178d8..abdfab1 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -66,6 +66,7 @@
     layui.use(['table','laydate', 'form'], function() {
         var table = layui.table;
         var $ = layui.jquery;
+        var layer = layui.layer;
         var form = layui.form;
         // 鐗╂枡鏌ヨ鏁版嵁琛�
         matQueryTable = table.render({
@@ -80,7 +81,7 @@
             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: '鐗╂枡鍗曚綅'},
@@ -111,11 +112,13 @@
             }
         });
 
-
-
         // 椤甸潰淇敼
         table.on('edit(matCode)', function (obj) {
-            updateMatCodeData(obj.data.matNo, Number(obj.value));
+            if (!isNaN(obj.value)) {
+                updateMatCodeData(obj.data.matNo, Number(obj.value));
+            } else {
+                layer.msg("璇疯緭鍏ユ暟瀛�");
+            }
         });
 
         // 鐩戝惉鎺掑簭浜嬩欢
@@ -126,7 +129,7 @@
             });
             searchData['orderByField'] = obj.field;
             searchData['orderByType'] = obj.type;
-            tableIns.reload({
+            matQueryTable.reload({
                 where: searchData,
                 page: {
                     curr: 1
@@ -146,7 +149,14 @@
             var checkStatus = table.checkStatus(obj.config.id);
             switch(obj.event) {
                 case 'confirm':
-                    console.log(checkStatus);
+                    // 鏁版嵁鏍煎紡妫�鏌�
+                    for (var i=0;i<matCodeData.length;i++){
+                        if (isNaN(matCodeData[i]["count"])) {
+                            layer.msg("鏁伴噺閿欒");
+                            return;
+                        }
+                    }
+                    parent.layer.close(parent.matCodeLayerIdx);
                     break;
             }
         });

--
Gitblit v1.9.1