Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r33936 -r34219 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 33936) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 34219) @@ -409,11 +409,10 @@ - +
科室数量:0 Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r34193 -r34219 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 34193) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 34219) @@ -2,6 +2,7 @@ var lock = false; var $lastTr = null; var scrollIndex = 1; +var awaitForRecyclePageSize = 20; var timeouts; //在页面无需将光标定位在输入框相应全局的扫描枪事件 var barcodeTemp = ''; @@ -369,7 +370,7 @@ var applyTimeOrder = $("#applyTimeOrder").val(); var orgUnitCoding = CookieManager.getCookie("applyDepartCode"); var operationRoom = CookieManager.getCookie("operationRoom"); - + $('#loadMore').css('display', 'block'); loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, false, '', scrollIndex, pageSize); }, 400); } @@ -802,7 +803,7 @@ var operationRoom = CookieManager.getCookie("operationRoom"); scrollIndex = 1; - loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, false, '', scrollIndex, 50); + loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, false, '', scrollIndex, awaitForRecyclePageSize); document.onkeydown = showKeyDown; setApplicationHeaderFilterStyle(); @@ -880,7 +881,7 @@ var orgUnitCoding = msg.orgUnitCoding; var operationRoom = CookieManager.getCookie("operationRoom"); scrollIndex = 1; - loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, true, msg.departMent, scrollIndex, 50); + loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, true, msg.departMent, scrollIndex, awaitForRecyclePageSize); } else { if (msg.isIdCardBarcode) { selectIdCardBarcode(barcode); @@ -1023,7 +1024,7 @@ var orgUnitCoding = CookieManager.getCookie("applyDepartCode"); var operationRoom = CookieManager.getCookie("operationRoom"); - loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, false, '', 1, 50); + loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, false, '', 1, awaitForRecyclePageSize); } // 获取待回收的申请单,即获取回收清点模块的待回收列表数据 @@ -1044,12 +1045,7 @@ pageSize: pageSize }, success: function (jsonData) { - if (jsonData.rows.length >= pageSize) { - $('#loadMore').css('display', 'flex'); - } else { - $('#loadMore').css('display', 'none'); - } - $('#awaitForRecycleTableBody').html(''); + $('#loadMore').css('display', 'none'); if (pageIndex == 1) { var departAmount = jsonData.departAmount; var invoicePlanAmount = jsonData.invoicePlanAmount; @@ -1882,5 +1878,5 @@ $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 290) + 'px' }); } - scrollLoadData(50); + scrollLoadData(awaitForRecyclePageSize); });