From 2a6e2daeeba4a63146f0a0906d98281abb3de5da Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 九月 2021 08:34:29 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/waitMatchk/waitMatchk.js | 43 ++++++++-----------------------------------
1 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/waitMatchk/waitMatchk.js b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
index 23d72f3..4dfd0e6 100644
--- a/src/main/webapp/static/js/waitMatchk/waitMatchk.js
+++ b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
@@ -1,10 +1,13 @@
var pageCurr;
-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 layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -18,8 +21,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�', merge:true}//,event: 'locNo', style: 'cursor:pointer'
+ {type: 'checkbox', merge: ['locNo$']}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�', merge: true}//,event: 'locNo', style: 'cursor:pointer'
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'seqNo', align: 'center',title: '搴忓彿'}
@@ -56,6 +59,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -71,7 +75,6 @@
// });
// $('.layui-form-checkbox').css("pointer-events", "none");
// $('td[data-field="0').css("cursor", "pointer")
- merge(res);//璋冪敤
}
});
@@ -214,37 +217,6 @@
break;
}
});
-
- function merge(res) {
- var data = res.data;
- var mergeIndex = 0;//瀹氫綅闇�瑕佹坊鍔犲悎骞跺睘鎬х殑琛屾暟
- var mark = 1; //杩欓噷娑夊強鍒扮畝鍗曠殑杩愮畻锛宮ark鏄绠楁瘡娆￠渶瑕佸悎骞剁殑鏍煎瓙鏁�
- var columsName = ['', 'locNo\\$'];//闇�瑕佸悎骞剁殑鍒楀悕绉�
- var columsIndex = [0, 1];//闇�瑕佸悎骞剁殑鍒楃储寮曞��
-
- for (var k = 0; k < columsName.length; k++) { //杩欓噷寰幆鎵�鏈夎鍚堝苟鐨勫垪
- var trArr = $(".layui-table-body>.layui-table").find("tr");//鎵�鏈夎
- for (var i = 1; i < res.data.length; i++) { //杩欓噷寰幆琛ㄦ牸褰撳墠鐨勬暟鎹�
- var tdCurArr = trArr.eq(i).find("td").eq(columsIndex[k]);//鑾峰彇褰撳墠琛岀殑褰撳墠鍒�
- var tdPreArr = trArr.eq(mergeIndex).find("td").eq(columsIndex[k]);//鑾峰彇鐩稿悓鍒楃殑绗竴鍒�
-
- if (data[i][columsName[k]] === data[i - 1][columsName[k]]) { //鍚庝竴琛岀殑鍊间笌鍓嶄竴琛岀殑鍊煎仛姣旇緝锛岀浉鍚屽氨闇�瑕佸悎骞�
- mark += 1;
- tdPreArr.each(function () {//鐩稿悓鍒楃殑绗竴鍒楀鍔爎owspan灞炴��
- $(this).attr("rowspan", mark);
- });
- tdCurArr.each(function () {//褰撳墠琛岄殣钘�
- $(this).css("display", "none");
- });
- } else {
- mergeIndex = i;
- mark = 1;//涓�鏃﹀墠鍚庝袱琛岀殑鍊间笉涓�鏍蜂簡锛岄偅涔堥渶瑕佸悎骞剁殑鏍煎瓙鏁癿ark灏遍渶瑕侀噸鏂拌绠�
- }
- }
- mergeIndex = 0;
- mark = 1;
- }
- }
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
@@ -489,6 +461,7 @@
curr: pageCurr
},
done: function (res, curr, count) {
+ layui.tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
--
Gitblit v1.9.1