From e045828d139240a69b066e7653f7cc2b37b4dcfd Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期四, 26 九月 2024 15:19:15 +0800 Subject: [PATCH] 工序流转卡:分页 --- WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 208 +++++++++++++++++++++++++++++++++++++++++++++++---- WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2 2 files changed, 190 insertions(+), 20 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user index 3b585ad..b2d0a8b 100644 --- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user +++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user @@ -6243,7 +6243,7 @@ <publishTime>08/28/2024 18:15:51</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html"> - <publishTime>09/11/2024 21:05:01</publishTime> + <publishTime>09/26/2024 15:16:55</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html"> <publishTime>01/05/2024 08:43:43</publishTime> diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" index 13bf017..eeb7f8f 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" @@ -65,10 +65,10 @@ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1"> </div> </div> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display:none;" lay-filter="btnSearch" id="btnSearch"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button> <!--鏄剧ず褰撳墠杩囨护鏂规--> <div class="layui-inline" style="margin-left:5px;"> <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div> @@ -221,9 +221,10 @@ </div> <!--<div class="layui-tab-item layui-show">--> <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table> + <div id="page" style="margin-top:70px;"></div> <!--</div>--> <!--<table class="" id="mainTable" lay-filter="mainTable"></table> - <table class="" id="mainTable2" lay-filter="mainTable2"></table>--> + <table class="" id="mainTable2" lay-filter="mainTable2"></table>--> <div class="layui-tab layui-tab-card" style="margin-top:40px;"> <ul class="layui-tab-title"> <li class="layui-this">宸ヨ壓娴佺▼</li> @@ -286,14 +287,14 @@ <script type="text/html" id="toolbarDemo2"> <div class="layui-btn-container"> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button> - <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>--> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>--> <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_HideColumn2" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>--> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>--> @@ -336,9 +337,15 @@ , laydate = layui.laydate , util = layui.util , soulTable = layui.soulTable + + var Organization = sessionStorage["Organization"]; + //var sWhere = " 浜у搧浠g爜 = 'BX0002'"; var sWhere = ""; var option = ""; + var page = 1;//鍒嗛〉鏁版嵁 + var size = 50; + var option2 = ""; var option3 = ""; var option4 = ""; @@ -581,17 +588,30 @@ //#region 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); + + if (page != 1) { + $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤� + } else { + if ($("#HProject").val() == 0) { + get_FastQuery(); + } else { + get_FastQuery(2); + } + } }); //#endregion //#region 鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { - if ($("#HProject").val() == 0) { - get_FastQuery(); + if (page != 1) { + $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤� } else { - get_FastQuery(2); + if ($("#HProject").val() == 0) { + get_FastQuery(); + } else { + get_FastQuery(2); + } } - }); //#endregion @@ -824,7 +844,10 @@ //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰� sWhere += getSWhereByHUser(); - get_Display(sWhere); + //get_Display(sWhere); + + get_DisplayPage(sWhere); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 } //#endregion @@ -1175,11 +1198,11 @@ option = { elem: '#mainTable' , toolbar: '#toolbarDemo' - , page: true - , height: 300 + //, page: true + , height: 'full-80' , cellMinWidth: 90 , limit: 50 - , limits: [50, 500, 5000, 20000] + //, limits: [50, 500, 5000, 20000] , cols: [[ // { type: 'checkbox', fixed: 'left' } // , { field: 'hmainid', title: 'hmainid', width: 90, hide: true } @@ -1240,6 +1263,31 @@ ]] }; //table.render(option); + + + optionPage = { + elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙� + count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒� + limit: 50, + limits: [50, 500, 5000, 50000], + layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'], + jump: function (obj, first) { + //console.log(obj) + //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛� + //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔$璇锋眰瀵瑰簲椤电殑鏁版嵁銆� + //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁� + + //棣栨涓嶆墽琛� + if (!first) { + //do something + console.log(obj) + page = obj.curr; + size = obj.limit; + get_FastQuery(); + } + } + } + laypage.render(optionPage); } //鍒濆鍖栦粠琛ㄥ垪琛� 宸ヨ壓娴佺▼ @@ -1476,6 +1524,127 @@ } //#endregion + //#region 鏌ヨ(涓昏〃)-鍒嗛〉 + function get_DisplayPage(sWhere) { + var wait = layer.load();//閬僵 + var ajaxLoad = layer.load(); + sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and HBillSubType<>'SUB'"; + $.ajax({ + url: GetWEBURL() + '/LEMS/Sc_ProcessExchangeBillList_Query_byPage', + type: "GET", + async: false, + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size, "HBillSubType": "3772" }, + success: function (data1) { + option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏� + if (data1.count != 0) { + optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟 + var data = []; + var col = []; + //缁欑┖鐨勬暟缁勮祴鍊� + for (var key in data1.list) { + data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); + } + //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋 + col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }); + for (var i = 0; i < data.length; i++) { + // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') { + if ($.inArray(data[i].name, titleData) > -1) { + col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� + } + //else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒� + // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 }); + //} + else if (data[i].name == '鍗曟嵁鍙�') { + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' }); + } + else { + switch (data[i].Type) { + //int + case 'DateTime': + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); + break; + default: + if (data[i].name == '鐢熶骇鏁伴噺' || data[i].name == '娴佽浆鍗℃暟閲�' || data[i].name == '鍏ュ簱鏁伴噺' || data[i].name == '绱杩涚珯鏁伴噺' || data[i].name == '绱鍚堟牸鍑虹珯鏁伴噺' || data[i].name == '绱鎶ュ簾鏁伴噺' || data[i].name == '绱涓嶈壇鏁伴噺' || data[i].name == '鏈亾宸ュ簭鍑虹珯鏁伴噺') { + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true }); + } else { + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + } + } + } + } + + //鍔ㄦ�佹樉绀哄垪鍚� + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , cols: [col] + , data: data1.data + , height: 780 + //, page: true + , totalRow: true + , cellMinWidth: 90 + , limit: 50 + //, limits: [50, 500, 5000, 20000] + , done: function (res, curr, count) { + soulTable.render(this); + } + //, done: function (res, curr, count) { + // var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td'); + // var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th'); + // var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td'); + // for (var i = 0; i < $data.length; i++) { + // var l1 = $data.eq(i).find('div').width(); + // var l2 = $head.eq(i).find('div').width(); + // if (l1 > l2) { + // $head.eq(i).find('div').width(l1); + // $total.eq(i).find('div').width(l1); + // } else { + // $data.eq(i).find('div').width(l2); + // $total.eq(i).find('div').width(l2); + // } + // } + //} + } + ins = table.render(option); + + laypage.render(optionPage); + //鍒锋柊琛ㄦ牸鏁版嵁 + DisPlay_HideColumn(); + + var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞� + Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]); + + if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") { + ColFilter(); + } + + //鏈夋暟鎹殑鎯呭喌涓�,榛樿鏄剧ず绗竴鏉$殑鏄庣粏鏁版嵁 + if (data1.data.length > 0) { + get_DisplaySub(data1.data[0]); + } + + layer.close(ajaxLoad); + } else { + optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟 + laypage.render(optionPage); + + option.data = []; + table.render(option); + layer.close(ajaxLoad); + /*layer.alert(data1.code + data1.Message, { icon: 5 });*/ + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + + DisPlay_HideColumn(); + + layer.close(wait); + } + //#endregion + //#region 闅愯棌鍒楄缃� (涓诲垪琛�) function get_HideColumn1() { var colName = ""; @@ -1644,6 +1813,7 @@ $.ajax({ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', type: "GET", + async: false, data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" }, success: function (data1) { if (data1.count == 1) { -- Gitblit v1.9.1