From 2be1922b035c182c3c516427aa68be54badd6938 Mon Sep 17 00:00:00 2001 From: IPC-610 <IPC-610@DESKTOP-6LEOOS3> Date: 星期四, 26 九月 2024 15:15:52 +0800 Subject: [PATCH] 登录页修改 --- HTML/views/SOSetting/ExportAllot.html | 377 +++++++++++++++++++++-------------------------------- 1 files changed, 151 insertions(+), 226 deletions(-) diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html index f0c753f..60ef0e8 100644 --- a/HTML/views/SOSetting/ExportAllot.html +++ b/HTML/views/SOSetting/ExportAllot.html @@ -13,21 +13,21 @@ <script> // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮� - document.addEventListener("DOMContentLoaded", function() { + document.addEventListener("DOMContentLoaded", function () { //鑾峰彇table榛樿鏄剧ず鏁� pageCntFirst(); //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆� GetIsSetColW(); }); - </script> + </script> <link rel="stylesheet" href="../../css/public.css" media="all"> </head> -<body> +<body id="body"> <div class="layui-fluid" style="padding-bottom: 0;"> <div class="layui-card"> - <div class="layui-form layui-card-header layuiadmin-card-header-auto"> + <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top"> <div class="layui-form-item"> <div class="layui-inline"> @@ -120,10 +120,13 @@ <div class="layui-card-body"> <div> <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> - <ul class="layui-tab-title"> + <ul class="layui-tab-title" id="tab"> <li class="layui-this">鎵樼洏淇℃伅</li> <li>绠辩爜淇℃伅</li> </ul> + + <div id="center"></div> + <div class="layui-tab-content"> <div class="layui-tab-item layui-show"> <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� --> @@ -214,15 +217,38 @@ }} {{ GetBtn7(d) }} </script> + <script type="text/html" id="templetUpdateTime"> + {{# function GetBtn71(d){ + return formatDate(d.UpdateTime); + } + }} + {{ GetBtn71(d) }} + </script> + <script type="text/html" id="templetUnstackingMode"> + {{# function GetBtn8(d){ + switch (d.UnstackingMode) { + case "0": + return "鏈哄櫒浜烘媶鍨�"; + case "1": + return "浜哄伐鎷嗗灈"; + default: + return ""; + } + } + }} + {{ GetBtn8(d) }} + </script> + <!-- #endregion --> - </div> + </div> </div> <div class="layui-tab-item"> <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� --> <table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table> <!-- #region 鑷畾涔夎〃澶� --> <div class="headerSetIcon"> - <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2"> + <button class="layui-btn layui-btn-primary layui-btn-sm" + data-type="customCols2"> <i class="layui-icon"></i> </button> </div> @@ -237,7 +263,7 @@ {{ GetBtn8(d) }} </script> <!-- #endregion --> - </div> + </div> </div> </div> </div> @@ -258,7 +284,7 @@ <script type="text/html" id="table-content-list2"> {{# function GetBtn2(d){ var html = ''; - if(d.SkuNo != "100099"){ + if(d.SkuNo != "100099" && d.BoxNo != ''){ html =`<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sel"> <i class="layui-icon layui-icon-edit"></i>璇︽儏</a>`; } @@ -288,6 +314,8 @@ layer = layui.layer, laydate = layui.laydate; var $ = layui.$; + var h1 = GetTableTabHeight(); + // var h1 = GetTableTopHeight(); // var h2 = GetTableBottomHeight(); // laydate.render({ @@ -305,27 +333,30 @@ //娓叉煋鍑哄簱鍒嗛厤table //#region 鑷畾涔夎〃澶� var TotalColsArr = [[ - {field: '',title: '搴忓彿',type:'numbers',width: 60,align: 'center',fixed: 'left', "disabled": true}, - {field: 'SONo',title: '鍑哄簱鍗曞彿',align: 'center',fixed: 'left',width: 180,"disabled": true}, - {field: 'WaveNo',title: '娉㈡鍗曞彿',align: 'center',width: 180}, - {field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 95,}, - {field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',minWidth: 120}, - {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',width: 150}, - {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 125}, - {field: 'Status',align: 'center',title: '鐘舵��',width: 90,templet: '#templetStatus'}, - {field: 'Qty',title: '鍑哄簱鏁伴噺',align: 'center',width: 90,}, - {field: 'CompleteQty',title: '鎷h揣鏁伴噺',align: 'center',width: 90}, - {field: 'OutMode',title: '鍑哄簱鍙�',align: 'center',width: 90,templet: '#outType',}, - {field: 'IsAdvance',title: '鎷h揣绫诲瀷',align: 'center',width: 90,templet: '#templetIsAdvance'}, - {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 110}, - {field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 150}, - {field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',minWidth: 120,}, - {field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',templet: '#templetIsBale',width: 90}, - {field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',templet: '#templetIsBelt',width: 90}, - {field: 'CreateTime',align: 'center',title: '鍒涘缓鏃堕棿',width: 160,templet: '#templetCreateTime'}, - {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'center',toolbar: '#table-content-list', "disabled": true} - ]]; - var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜 + { field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true }, + { field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', fixed: 'left', width: 180, "disabled": true }, + { field: 'WaveNo', title: '娉㈡鍗曞彿', align: 'center', width: 180 }, + { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 95, }, + { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', minWidth: 120 }, + { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 150 }, + { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 125 }, + { field: 'Status', align: 'center', title: '鐘舵��', width: 90, templet: '#templetStatus' }, + { field: 'Qty', title: '鍑哄簱鏁伴噺', align: 'center', width: 90, }, + { field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center', width: 90 }, + { field: 'UnstackingMode', title: '鎷嗗灈鏂瑰紡', align: 'center', width: 90, templet: '#templetUnstackingMode' }, + { field: 'OutMode', title: '鍑哄簱鍙�', align: 'center', width: 90, templet: '#outType', }, + { field: 'LoadingAddre', title: '瑁呰溅鍙�', align: 'center', width: 90, templet: '#outType', }, + { field: 'IsAdvance', title: '鎷h揣绫诲瀷', align: 'center', width: 90, templet: '#templetIsAdvance' }, + { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 110 }, + { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150 }, + { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', minWidth: 120, }, + { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 }, + { field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 }, + { field: 'CreateTime', align: 'center', title: '鍒涘缓鏃堕棿', width: 160, templet: '#templetCreateTime' }, + { field: 'UpdateTime', align: 'center', title: '瀹屾垚鏃堕棿', width: 160, templet: '#templetUpdateTime' }, + { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#table-content-list', "disabled": true } + ]]; + var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜 //#endregion function refreshTable() { //#region 鍘熷闈炶嚜瀹氫箟鍒� @@ -520,18 +551,18 @@ //#region 鑷畾涔夎〃澶� var colsJson - var param1={ - Href:'BllSo/GetExportAllotList' + var param1 = { + Href: 'BllSo/GetExportAllotList' }; - sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) { - if (res.code == 0){ - if(res.data=='' || res.data==undefined || res.data==null){ - colsJson=TotalColsArr - }else{ - colsJson= eval(res.data); + sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) { + if (res.code == 0) { + if (res.data == '' || res.data == undefined || res.data == null) { + colsJson = TotalColsArr + } else { + colsJson = eval(res.data); } - }else{ - colsJson=TotalColsArr + } else { + colsJson = TotalColsArr } var param = { SoNo: $("#SoNo").val(), @@ -547,7 +578,7 @@ elem: '#LAY-app-content-list', url: IP + "/BllSo/GetExportAllotList", method: 'POST', - height: 'full-210', + height: h1, id: 'LAY-app-content-list', where: param, contentType: 'application/json', @@ -556,11 +587,11 @@ limit: pageCnt, limits: pageLimits, cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板 - done: function(){ + done: function () { initMenu(); //鑷畾涔夊垪瀹� - SetTableColW('LAY-app-content-list','BllSo/GetExportAllotList',TotalColsSysArr); - }, + SetTableColW('LAY-app-content-list', 'BllSo/GetExportAllotList', TotalColsSysArr); + }, cols: colsJson }); }); @@ -570,163 +601,50 @@ //娓叉煋鎷h揣鏄庣粏table //#region 鑷畾涔夎〃澶� var DetailColsArr = [[ - {field: '',title: '搴忓彿',type:'numbers',width: 60,align: 'center',fixed: 'left', "disabled": true}, - {field: 'SONo',title: '鍑哄簱鍗曞彿',align: 'center',fixed: 'left',width: 180, "disabled": true}, - {field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 95}, - {field: 'BoxNo',title: '绠卞彿',align: 'center',width: 220}, - //{field: 'BoxNo2',title: '鐩掑彿',align: 'center',width: 115}, - //{field: 'BoxNo3',title: '鏀彿',align: 'center',width: 115}, - {field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',width: 120,}, - {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'}, - {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 125,}, - {field: 'CompleteQty',title: '鎷h揣鏁伴噺',align: 'center',width: 90,}, - {field: 'NowPalletNo',title: '鏂版墭鐩�',align: 'center',width: 95,}, - {field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 150,}, - {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 110,}, - {field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 120,}, - //{field: 'CreateTime',align: 'center',title: '鍒涘缓鏃堕棿',width: 165,templet: '#templetCreateTime2'}, - {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'left',toolbar: '#table-content-list2', "disabled": true} - ]]; - var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜 + { field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true }, + { field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', fixed: 'left', width: 180, "disabled": true }, + { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 95 }, + { field: 'BoxNo', title: '绠卞彿', align: 'center', width: 220 }, + //{field: 'BoxNo2',title: '鐩掑彿',align: 'center',width: 115}, + //{field: 'BoxNo3',title: '鏀彿',align: 'center',width: 115}, + { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 120, }, + { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' }, + { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 125, }, + { field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center', width: 90, }, + { field: 'NowPalletNo', title: '鏂版墭鐩�', align: 'center', width: 95, }, + { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, }, + { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 110, }, + { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 120, }, + //{field: 'CreateTime',align: 'center',title: '鎷h揣鏃堕棿',width: 165,templet: '#templetCreateTime2'}, + { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true } + ]]; + var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜 //#endregion function refreshTablemx(val) { - //#region 鍘熷闈炶嚜瀹氫箟鍒� - // var param = { - // Id: parseInt(val) - // }; - - // table.render({ - // elem: '#LAY-app-content-list2', - // url: IP + "/BllSo/GetCompleteDetailList", - // method: 'POST', - // height: 'full-206', - // id: 'LAY-app-content-list2', - // where: param, - // contentType: 'application/json', - // headers: { ToKen: $.cookie('token') }, - // page: true, - // limit: pageCnt, - // limits: pageLimits, - // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板 - // done: function(){ - // initMenu(); - // }, - // cols: [ - // [{ - // title: '搴忓彿', - // type: 'numbers', - // width: 60, - // fixed: 'left' - // }, { - // field: 'SONo', - // title: '鍑哄簱鍗曞彿', - // align: 'center', - // fixed: 'left', - // width: 180, - // }, { - // field: 'PalletNo', - // title: '鎵樼洏鍙�', - // align: 'center', - // width: 95, - // }, { - // field: 'BoxNo', - // title: '绠卞彿', - // align: 'center', - // width: 220, - // }, { - // field: 'BoxNo2', - // title: '鐩掑彿', - // align: 'center', - // width: 115, - // hide: true, - // }, { - // field: 'BoxNo3', - // title: '鏀彿', - // align: 'center', - // width: 115, - // hide: true, - // }, { - // field: 'SkuNo', - // title: '鐗╂枡缂栫爜', - // align: 'center', - // width: 120, - // }, { - // field: 'SkuName', - // title: '鐗╂枡鍚嶇О', - // align: 'center', - // }, { - // field: 'LotNo', - // title: '鎵规鍙�', - // align: 'center', - // width: 125, - // }, { - // field: 'CompleteQty', - // title: '鎷h揣鏁伴噺', - // align: 'center', - // width: 90, - // }, { - // field: 'NowPalletNo', - // title: '鏂版墭鐩�', - // align: 'center', - // width: 95, - // }, { - // field: 'LotText', - // title: '鎵规鎻忚堪', - // align: 'center', - // width: 150, - // }, { - // field: 'SupplierLot', - // title: '渚涜揣鎵规', - // align: 'center', - // width: 110, - // }, { - // field: 'Standard', - // title: '鐗╂枡瑙勬牸', - // align: 'center', - // width: 120, - // }, { - // field: 'CreateTime', - // align: 'center', - // title: '鍒涘缓鏃堕棿', - // width: 165, - // templet: function (d) { - // return formatDate(d.CreateTime); - // }, - // hide: true, - // }, { - // title: '鎿嶄綔', - // fixed: 'right', - // width: 90, - // align: 'center', - // toolbar: '#table-content-list2' - // }] - // ] - // }); - //#endregion - + //#region 鑷畾涔夎〃澶� var colsJson2 - var param1={ - Href:'BllSo/GetCompleteDetailList' + var param1 = { + Href: 'BllSo/GetCompleteDetailList' }; - sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) { - if (res.code == 0){ - if(res.data=='' || res.data==undefined || res.data==null){ - colsJson2=DetailColsArr - }else{ - colsJson2= eval(res.data); + sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) { + if (res.code == 0) { + if (res.data == '' || res.data == undefined || res.data == null) { + colsJson2 = DetailColsArr + } else { + colsJson2 = eval(res.data); + } + } else { + colsJson2 = DetailColsArr } - }else{ - colsJson2=DetailColsArr - } - var param = { - Id: parseInt(val) - }; - table.render({ + var param = { + Id: parseInt(val) + }; + table.render({ elem: '#LAY-app-content-list2', url: IP + "/BllSo/GetCompleteDetailList", method: 'POST', - height: 'full-206', + height: h1, id: 'LAY-app-content-list2', where: param, contentType: 'application/json', @@ -735,11 +653,11 @@ limit: pageCnt, limits: pageLimits, cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板 - done: function(){ + done: function () { initMenu(); //鑷畾涔夊垪瀹� - SetTableColW('LAY-app-content-list2','BllSo/GetCompleteDetailList',DetailColsSysArr); - }, + SetTableColW('LAY-app-content-list2', 'BllSo/GetCompleteDetailList', DetailColsSysArr); + }, cols: colsJson2 }); }); @@ -754,17 +672,16 @@ }); //鏉冮檺 function initMenu() { - $(function() { + $(function () { $(".chexiaoClass").hide(); //鎾ら攢 }); - sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) { + sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) { if (res.code == 0) { //鎴愬姛 for (var k = 0; k < res.data.length; k++) { - if(res.data[k].ParentNo == "2400") - { + if (res.data[k].ParentNo == "2400") { if (res.data[k].MenuName == "鎾ら攢") { console.log(res.data[k].MenuName); - $(function() { + $(function () { $(".chexiaoClass").show(); }); } @@ -774,7 +691,7 @@ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 - }, function() {}); + }, function () { }); } }); } @@ -801,30 +718,38 @@ yemianid = 1; }); var doing = true; - //鍒犻櫎 + //鎾ら攢 table.on('tool(LAY-app-content-list)', function (obj) { console.log(obj); if (obj.event === 'del') { layer.confirm('纭畾鎾ら攢閫変腑鐨勫垎閰嶄俊鎭悧锛�', function (index) { - var param = { - Id: parseInt(obj.data.Id) - }; - sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) { - console.log(res); - if (res.code == 0) { //鎴愬姛 - layer.msg(res.msg, { - icon: 1, - time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 - }, function () { - refreshTable(); - }); - } else { //涓嶆垚鍔� - layer.msg(res.msg, { - icon: 2, - time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 - }, function () { }); - } - }); + if (doing) { + doing = false; + + var param = { + Id: parseInt(obj.data.Id) + }; + sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) { + console.log(res); + if (res.code == 0) { //鎴愬姛 + layer.msg(res.msg, { + icon: 1, + time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 + }, function () { + refreshTable(); + doing = true; + }); + } else { //涓嶆垚鍔� + layer.msg(res.msg, { + icon: 2, + time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 + }, function () { + doing = true; + }); + } + }); + } + }); } }); @@ -863,21 +788,21 @@ //#region 鑷畾涔夎〃澶� //鑷畾涔夎〃澶� active = { - customCols: function(){ + customCols: function () { layer.open({ type: 2, title: '鑷畾涔夊垪', - content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetExportAllotList&ColsSysArr='+TotalColsSysArr, + content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetExportAllotList&ColsSysArr=' + TotalColsSysArr, maxmin: false, resize: false, area: ['970px', '650px'] }); }, - customCols2: function(){ + customCols2: function () { layer.open({ type: 2, title: '鑷畾涔夊垪', - content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetCompleteDetailList&ColsSysArr='+DetailColsSysArr, + content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetCompleteDetailList&ColsSysArr=' + DetailColsSysArr, maxmin: false, resize: false, area: ['970px', '650px'] @@ -885,7 +810,7 @@ } }; - $('.layui-btn').on('click', function() { + $('.layui-btn').on('click', function () { var type = $(this).data('type'); active[type] ? active[type].call(this) : ''; }); -- Gitblit v1.8.0