From 1f95ae05e0627b3d3f4f206ceb1ca8ced0227583 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 23 五月 2025 13:38:56 +0800
Subject: [PATCH] #出库混合物料无法选中bug修复

---
 src/main/webapp/views/pakStore/locDetlQuery.html |   22 +++++++++++++++++++++-
 src/main/webapp/static/js/pakStore/stockOut.js   |    5 ++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index d9b2580..de516ce 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -14,12 +14,14 @@
 
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function() {
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
     var form = layui.form;
     var admin = layui.admin;
+    var tableMerge = layui.tableMerge;
+
 
     tableIns = table.render({
         elem: '#chooseData',
@@ -31,6 +33,7 @@
         limit: 500,
         cols: [getCol()],
         done: function(res, curr, count) {
+            tableMerge.render(this);
             limit();
             getOutBound();
         }
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index c422c02..db521c2 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -184,9 +184,29 @@
             switch(obj.event) {
                 case 'confirm':
                     if (data.length === 0){
-                        layer.msg("璇烽�夋嫨鏁版嵁");
+                        layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
                         return;
                     }
+                    let locNos = [];
+                    data.forEach(function(elem) {
+                        locNos.push(elem.locNo);
+                    });
+                    $.ajax({
+                        url: baseUrl+"/locDetl/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: {locNos:locNos},
+                        method: 'POST',
+                        async: false,
+                        success: function (res) {
+                            if (res.code === 200) {
+                                data = res.data;
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl + "/";
+                            } else {
+                                layer.msg(res.msg)
+                            }
+                        }
+                    })
                     parent.addTableData(data);
                     break;
             }

--
Gitblit v1.9.1