From 945ab0817d60428288b2ae60378a9c117728cffa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 10:54:39 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/pakStore.js |   61 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 1bccce2..e7af385 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,6 +1,14 @@
 
 var initCountVal = 0;
 var matCodeData = [];
+function getCol() {
+    var cols = [
+        {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
+    ];
+    cols.push.apply(cols, matCols);
+    cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+    return cols;
+}
 
 layui.use(['table','laydate', 'form'], function() {
     var table = layui.table;
@@ -16,15 +24,7 @@
         limit: 500,
         cellMinWidth: 50,
         toolbar: '#toolbar',
-        cols: [[
-            {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
-            {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-            {field: 'barcode', align: 'center', title: '鏉＄爜'},
-            {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
-            {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
-            {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
-            {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
-        ]],
+        cols: [getCol()],
         done: function (res, curr, count) {
             $('td[data-field=count] div').html(initCountVal);
             setMatCodeData(res.data);
@@ -64,7 +64,7 @@
                     url: baseUrl+"/full/store/put/start",
                     headers: {'token': localStorage.getItem('token')},
                     data: JSON.stringify({
-                        devpNo: $('#putSiteSelect').val(),
+                        devpNo: Number($('#putSiteSelect').val()),
                         list: matCodeData
                     }),
                     contentType:'application/json;charset=UTF-8',
@@ -74,7 +74,9 @@
                         if (res.code === 200){
                             layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
                             matCodeData = [];
+                            $('#focusMatByMat').val("");
                             tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
+                            document.getElementById("focusMatByMat").focus();
                         } else if (res.code === 403){
                             top.location.href = baseUrl+"/";
                         }else {
@@ -174,12 +176,47 @@
     });
 }
 
+// 鎵爜
+function focusMat(el) {
+    if (isEmpty(el.value)) {
+        return
+    }
+    $.ajax({
+        url: baseUrl + "/matCode/" + el.value + "/auth",
+        headers: {'token': localStorage.getItem('token')},
+        method: 'GET',
+        success: function (res) {
+            if (res.code === 200) {
+                matCodeData = [];
+                var param = new Array();
+                param[0] = res.data;
+                addTableData(param);
+            } else if (res.code === 403) {
+                top.location.href = baseUrl + "/";
+            } else {
+                layer.msg(res.msg, {icon: 2})
+            }
+        }
+    })
+}
+
 // 娣诲姞琛ㄦ牸鏁版嵁
 function addTableData(data) {
     for (var i=0;i<data.length;i++){
-        data[i]["count"] = initCountVal;
+        let pass = false;
+        for (var j=0;j<matCodeData.length;j++){
+            if (data[i].matNo === matCodeData[j].matNo) {
+                pass = true;
+                break;
+            }
+        }
+        if (pass) {
+            data.splice(i--, 1);
+        } else {
+            data[i]["count"] = initCountVal;
+        }
     }
     matCodeData.push.apply(matCodeData, data);
     tableIns.reload({data: matCodeData});
     layer.close(matCodeLayerIdx);
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1