From 79220444c7fae6e507a6df13b2c8be1578343b7d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 10:35:18 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 8625246..18bb214 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';
-                }
-            });
         }
     });
 

--
Gitblit v1.9.1