From f82462cee0e54bf7d2af916600830343c318f48e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 三月 2021 09:52:08 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pda/comb.html       |    4 ++--
 src/main/webapp/views/pda/stockCheck.html |   40 +++++++++++++++++++++++++++++++++++-----
 src/main/webapp/views/pda/matQuery.html   |   10 +++++-----
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index fc91698..920dc31 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -156,7 +156,7 @@
     function getMat() {
         matCodeLayerIdx = layer.open({
             type: 2,
-            title: '鎻愬彇鐗╂枡',
+            title: '鎻愬彇鍟嗗搧',
             shade: [0.3,'#000'],
             area: ['90%', '80%'],
             content: 'matQuery.html',
@@ -176,7 +176,7 @@
             tips("鎻愬彇澶辫触", true);
             return;
         }
-        let toPush = true;
+        var toPush = true;
         for (var j=0;j<matData.length;j++){
             if (data.matnr === matData[j].matnr) {
                 matData[j].count = Number(matData[j].count) + Number(data.count);
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 0ed5255..88fd490 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
-    <title>鐗╂枡鎻愬彇</title>
+    <title>鍟嗗搧鎻愬彇</title>
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
     <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>
@@ -76,15 +76,15 @@
 
 <div class="form-box">
     <div class="form-item">
-        <span>鐗╂枡缂栫爜</span>
+        <span>鍟嗗搧缂栫爜</span>
         <input id="matnr" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
     </div>
     <div class="form-item">
-        <span>鐗╂枡鍚嶇О</span>
+        <span>鍟嗗搧鍚嶇О</span>
         <input id="maktx" type="text" disabled="disabled">
     </div>
     <div class="form-item">
-        <span>鐗╂枡瑙勬牸</span>
+        <span>鍟嗗搧瑙勬牸</span>
         <input id="specs" type="text" disabled="disabled">
     </div>
     <div class="form-item">
@@ -107,7 +107,7 @@
     var pageCurr;
 
     /**
-     * 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡璇︽儏
+     * 鏍规嵁鍟嗗搧缂栫爜鏌ヨ鍟嗗搧璇︽儏
      */
     function find(el){
         if (isEmpty(el.value)) {
diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index 2a86ad6..89c77a8 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -163,7 +163,7 @@
                 if (res.code === 200) {
                     if (res.data != null) {
                         locDetlData = [];
-                        addTableData(res.data);
+                        initTableData(res.data);
                     }
                 } else if (res.code === 403) {
                     top.location.href = baseUrl + "/pda";
@@ -176,12 +176,11 @@
 
     // 娣诲姞琛ㄦ牸鏁版嵁
     var locDetlData = [];
-    function addTableData(data) {
+    function initTableData(data) {
         for (var i=0;i<data.length;i++) {
             var toPush = true;
             for (var j=0;j<locDetlData.length;j++){
                 if (data[i].matnr === locDetlData[j].matnr) {
-                    // locDetlData[j].anfme = Number(locDetlData[j].anfme) + Number(data[i].anfme);
                     toPush  = false;
                 }
             }
@@ -190,7 +189,22 @@
             }
         }
         tableIns.reload({data: locDetlData});
-        // $("#comb-btn").focus();
+    }
+    function addTableData(data) {
+        if (isEmpty(data.matnr)){
+            tips("鎻愬彇澶辫触", true);
+            return;
+        }
+        var toPush = true;
+        for (var j=0;j<locDetlData.length;j++){
+            if (data.matnr === locDetlData[j].matnr) {
+                toPush  = false;
+            }
+        }
+        if (toPush) {
+            locDetlData.push(data);
+        }
+        tableIns.reload({data: locDetlData});
     }
 
     /*************************************  鏁伴噺  ****************************************/
@@ -239,7 +253,23 @@
 
 
 
-
+    /*************************************  琛ュ厖  ****************************************/
+    var matCodeLayerIdx;
+    function replenish() {
+        matCodeLayerIdx = layer.open({
+            type: 2,
+            title: '琛ュ厖鍟嗗搧',
+            shade: [0.3,'#000'],
+            area: ['90%', '80%'],
+            content: 'matQuery.html',
+            success: function(layero, index){
+                $('.layui-layer-title').css('font-size', '16px');
+            },
+            end: function () {
+                // $('#mat-btn').focus();
+            }
+        });
+    }
 
 
 

--
Gitblit v1.9.1