From 45dd167e12e11af8dc7929ff1475623c80fc3578 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 30 十月 2024 13:59:33 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 8625246..542f6b9 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -2,16 +2,19 @@
 var tableIns;
 function getCol() {
     var cols = [
-        {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+        {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
     ];
     cols.push.apply(cols, detlCols);
     return cols;
 }
 
-layui.use(['table','laydate', 'form'], function() {
+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({
@@ -41,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';
-                }
-            });
         }
     });
 
@@ -137,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