From c6bc9682699d3e10dc06a3d6641a70179e64f9a1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 九月 2021 08:32:11 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/waitMatchk/waitMatchk.js | 137 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/static/js/waitMatchk/waitMatchk.js b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
index 36085d0..23d72f3 100644
--- a/src/main/webapp/static/js/waitMatchk/waitMatchk.js
+++ b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
@@ -1,13 +1,10 @@
var pageCurr;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'tableMerge'], function(){
+layui.use(['table','laydate', 'form'], 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({
@@ -21,13 +18,12 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', merge: ['locNo$']}
+ {type: 'checkbox'}
+ ,{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: 'locNo$', merge: true, align: 'center',title: '搴撲綅鍙�'}
,{field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'seqNo', align: 'center',title: '搴忓彿'}
,{field: 'billType$', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
-
,{field: 'zpallet', align: 'center',title: '鎵樼洏鍙�'}
,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
@@ -37,10 +33,10 @@
,{field: 'ioStatus$', align: 'center',title: '瀹屾垚鐘舵��'}
,{field: 'ioTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
,{field: 'verifyStatus$', align: 'center',title: '瀹℃牳鐘舵��'}
- ,{field: 'verifyUser$', align: 'center',title: '瀹℃牳浜哄憳', hide: true}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'verifyUser$', align: 'center',title: '瀹℃牳浜哄憳',event: 'verifyUser', style: 'cursor:pointer', hide: true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer', hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{field: 'appeUser$', align: 'center',title: '寤烘。浜哄憳', hide: true}
+ ,{field: 'appeUser$', align: 'center',title: '寤烘。浜哄憳',event: 'appeUser', style: 'cursor:pointer', hide: true}
,{field: 'appeTime$', align: 'center',title: '寤烘。鏃堕棿', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
@@ -60,20 +56,22 @@
statusCode: 200
},
done: function(res, curr, count) {
- tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
- 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';
- }
- });
+ // 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';
+ // }
+ // });
+ // $('.layui-form-checkbox').css("pointer-events", "none");
+ // $('td[data-field="0').css("cursor", "pointer")
+ merge(res);//璋冪敤
}
});
@@ -105,18 +103,50 @@
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'addData':
- layer.open({
- type: 2,
- title: '鏂板',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'waitMatchk_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ var data = checkStatus.data;
+
+ for(var i=0;i<data.length;i++){
+ if (data[i].verifyStatus === 1) {
+ layer.msg('鏁版嵁鐘舵�佸凡瀹�');
+ return;
}
- });
+ }
+
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾瀹℃牳'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/waitMatchk/verify/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ // layer.open({
+ // type: 2,
+ // title: '鏂板',
+ // maxmin: true,
+ // area: [top.detailWidth, top.detailHeight],
+ // content: 'waitMatchk_detail.html',
+ // success: function(layero, index){
+ // layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ // clearFormVal(layer.getChildFrame('#detail', index));
+ // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ // }
+ // });
break;
case 'deleteData':
var data = checkStatus.data;
@@ -184,6 +214,37 @@
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) {
@@ -398,6 +459,20 @@
});
+// var b = true;
+// $(function(){
+// $(document.body).on('click','td[data-field="0"]',function(){
+// var locNo = $(this).next().children("div").html();
+// if (b) {
+// b = false;
+// $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
+// setTimeout(function () {
+// b = true;
+// }, 200)
+// }
+// });
+// })
+
// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
parent.layer.closeAll();
@@ -428,6 +503,8 @@
pageCurr -= 1;
}
limit(child);
+ // $('.layui-form-checkbox').css("pointer-events", "none");
+ // $('td[data-field="0').css("cursor", "pointer")
}
});
}
--
Gitblit v1.9.1