From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/static/js/pakStore/pakStore.js |   58 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 9d61001..dd0f6cb 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,10 +1,10 @@
-var admin;
+var matCodeLayerIdx;
 var initCountVal = 0;
 var matCodeData = [];
 function getCol() {
     var cols = [
         {fixed: 'left', field: 'anfme', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
-        {field: 'batch', title: '鎵瑰彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200,  style:'color: block;font-weight: bold'}
+        {field: 'batch', title: '搴忓垪鐮侊紙閫夊～锛�', align: 'center', edit:'text', width: 200,  style:'color: block;font-weight: bold'}
     ];
     cols.push.apply(cols, matCols);
     cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
@@ -18,7 +18,7 @@
     var $ = layui.jquery;
     var layer = layui.layer;
     var form = layui.form;
-    admin = layui.admin;
+    var admin = layui.admin;
 
     tableIns = table.render({
         elem: '#chooseData',
@@ -79,11 +79,16 @@
                         return;
                     }
                 }
+                let devpNo = $('#putSiteSelect').val();
+                if (isEmpty(devpNo)) {
+                    layer.msg("璇烽�夋嫨鍏ュ簱绔�", {icon: 2});
+                    return;
+                }
                 $.ajax({
                     url: baseUrl+"/full/store/put/start",
                     headers: {'token': localStorage.getItem('token')},
                     data: JSON.stringify({
-                        devpNo: Number($('#putSiteSelect').val()),
+                        devpNo: Number(devpNo),
                         list: matCodeData
                     }),
                     contentType:'application/json;charset=UTF-8',
@@ -95,7 +100,6 @@
                             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 {
@@ -104,19 +108,17 @@
                     }
                 })
                 break;
+            default:
+                break;
         }
     });
 
     // 鐩戝惉琛屽伐鍏蜂簨浠�
     table.on('tool(chooseData)', function(obj){
-        var data = obj.data;
         switch (obj.event) {
             case 'remove':
-                for (let i = matCodeData.length - 1; i >= 0; i--) {
-                    if (matCodeData[i].matNo === data.matNo && matCodeData[i].batch === data.batch) {
-                        matCodeData.splice(i, 1);
-                    }
-                }
+                let index = obj.tr.attr("data-index");
+                matCodeData.splice(index, 1);
                 tableIns.reload({data: matCodeData});
                 break;
         }
@@ -144,24 +146,26 @@
         })
     }
 
+    // 鎻愬彇鐗╂枡
+    $(document).on('click','#mat-query', function () {
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        matCodeLayerIdx = admin.open({
+            type: 2,
+            title: false,
+            closeBtn: false,
+            maxmin: false,
+            area: ['90%', '85%'],
+            shadeClose: true,
+            content: 'matQuery.html',
+            success: function(layero, index){
+                layer.close(loadIndex);
+            }
+        });
+    })
 
 });
 
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
-    matCodeLayerIdx = admin.open({
-        type: 2,
-        title: false,
-        closeBtn: false,
-        maxmin: false,
-        area: ['90%', '85%'],
-        shadeClose: true,
-        content: 'matQuery.html',
-        success: function(layero, index){
-        }
-    });
-}
+
 
 // 鎵爜
 function focusMat(el) {
@@ -169,7 +173,7 @@
         return
     }
     $.ajax({
-        url: baseUrl + "/matCode/" + el.value + "/auth",
+        url: baseUrl + "/mat/" + el.value + "/auth",
         headers: {'token': localStorage.getItem('token')},
         method: 'GET',
         success: function (res) {

--
Gitblit v1.9.1