From 812551e7e8afcc99d39c69cb41639018dc81f090 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 12 九月 2022 10:12:37 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/locMove.js |  115 ++++++++++++++++-----------------------------------------
 1 files changed, 32 insertions(+), 83 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 3894446..542f6b9 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -1,9 +1,20 @@
 var pageCurr = 0;
 var tableIns;
-layui.use(['table','laydate', 'form'], function() {
+function getCol() {
+    var cols = [
+        {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+    ];
+    cols.push.apply(cols, detlCols);
+    return cols;
+}
+
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'tableMerge'], function() {
     var table = layui.table;
     var $ = layui.jquery;
     var form = layui.form;
+    var tableMerge = layui.tableMerge;
 
     // 鏁版嵁娓叉煋
     tableIns = table.render({
@@ -16,19 +27,7 @@
         limits: [16, 50, 100, 200, 500],
         even: true,
         cellMinWidth: 50,
-        cols: [[
-            {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
-            // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
-            // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
-            // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
-            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
-            // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
-            ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-            ,{field: 'altme', align: 'center',title: '鍗曚綅'}
-            ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
-            // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
-        ]],
+        cols: [getCol()],
         request: {
             pageName: 'curr',
             pageSize: 'limit'
@@ -45,20 +44,13 @@
             statusCode: 200
         },
         done: function(res, curr, count) {
+            tableMerge.render(this);
             if (res.code === 403) {
                 top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
             clearSelect();
-            form.on('checkbox(tableCheckbox)', function (data) {
-                var _index = $(data.elem).attr('table-index')||0;
-                if(data.elem.checked){
-                    res.data[_index][data.value] = 'Y';
-                }else{
-                    res.data[_index][data.value] = 'N';
-                }
-            });
         }
     });
 
@@ -66,28 +58,24 @@
 
 // 鎼滅储搴撲綅鐗╂枡
 function getLoc(el) {
-    setTimeout(function () {
-        tableIns.reload({
-            url: baseUrl+'/locDetl/list/auth'
-            , where: {loc_no: el.value}
-            , done:function (res) {
-                limit();
-                clearSelect();
-                // 鑾峰彇鍚屼竴鍫嗗灈鏈虹殑绌哄簱浣�
-                http.post(baseUrl + "/group/empty/stock", {sourceLocNo: el.value}, function (res) {
-                    if (res.data != null) {
-                        var tpl = $("#emptyLocStock").html();
-                        var template = Handlebars.compile(tpl);
-                        var html = template(res);
-                        $('#targetLocNo').append(html);
-                        layui.form.render('select');
-                    }
-                });
-            }
-        });
-    }, 100)
-
-
+    tableIns.reload({
+        url: baseUrl+'/locDetl/list/auth'
+        , where: {loc_no: el.value}
+        , done:function (res) {
+            limit();
+            clearSelect();
+            // 鑾峰彇鍚屼竴鍫嗗灈鏈虹殑绌哄簱浣�
+            http.post(baseUrl + "/group/empty/stock", {sourceLocNo: el.value}, function (res) {
+                if (res.data != null) {
+                    var tpl = $("#emptyLocStock").html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    $('#targetLocNo').append(html);
+                    layui.form.render('select');
+                }
+            });
+        }
+    });
 }
 
 // 绉诲簱鍚姩
@@ -145,42 +133,3 @@
     $("#targetLocNo").empty();
     layui.form.render('select');
 }
-
-// // 搴撲綅鐘舵�佽幏鍙�
-// var tips;
-// function locStatus(el) {
-//     let val = el.value;
-//     if (val === null|| val === ""){
-//         return;
-//     }
-//     $.ajax({
-//         url: baseUrl+"/locMast/"+val+"/auth",
-//         headers: {'token': localStorage.getItem('token')},
-//         dataType:'json',
-//         method: 'POST',
-//         success: function (res) {
-//             if (res.code === 200) {
-//                 var status;
-//                 if (res.data != null) {
-//                     status = res.data.locType$;
-//                 } else {
-//                     status = "鏈壘鍒板簱浣�";
-//                 }
-//                 tips = layer.tips(
-//                     "<span style='color:#333;text-overflow: clip;'>"+status+"</span>",
-//                     el,
-//                     {
-//                         tipsMore: true,
-//                         area: ['160px'],
-//                         tips: [3,'#fff'],
-//                         time:0
-//                         ,maxWidth:500
-//                     });
-//             } else if (res.code === 403) {
-//                 top.location.href = baseUrl+"/";
-//             } else {
-//                 layer.msg(res.msg);
-//             }
-//         }
-//     });
-// }

--
Gitblit v1.9.1