Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r39012 -r39268 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 39012) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 39268) @@ -29,6 +29,18 @@ var foreignTousseInvoicedAndNoUseInfo = []; //缓存标识牌条码 var sessionIDCardBarcodes = new newMap(); + +//ZSYY-385:新增可配置扩展字段(显示序号,当前待回收物品) +var currentlyToBeRecycledBox = false; +var serialNumberBox = false; +if(sstsConfig.expandFieldsOfRecycle){ + if(sstsConfig.expandFieldsOfRecycle.indexOf('currentlyToBeRecycled') >= 0){ + currentlyToBeRecycledBox = true; + } + if(sstsConfig.expandFieldsOfRecycle.indexOf('serialNumber') >= 0){ + serialNumberBox = true; + } +} // 是否开启根据科室加载模板 function openLoadTemplateByUnit() { $("#departmentTemplate").change(function () { @@ -127,6 +139,8 @@ addToussItem(addColumnObj, true); } + updateTousseIndex(); + //恢复点击入筐后,回收数量和装配数量背景色的控制,因为前面删掉了全部的数据 if (hasCloumns.length > 0) { for (var k = 0; k < hasCloumns.length; k++) { @@ -607,6 +621,8 @@ } if (recycleAmount+1 <= 9999){ $('#recycleAmount'+row).val(recycleAmount+1); + var currentlyToBeRecycled = parseInt($('#currentlyToBeRecycled').html()); + $('#currentlyToBeRecycled').html(currentlyToBeRecycled+1); }else{ alertDiv("最大回收数量为9999,不能大于该数量!"); return @@ -703,6 +719,8 @@ return; } $('#recycleAmount' + row).val(recycleAmount); + var currentlyToBeRecycled = parseInt($('#currentlyToBeRecycled').html()); + $('#currentlyToBeRecycled').html(currentlyToBeRecycled-1); updateBindGoods(row); } setTousseItemLoadedAmountCss(row); @@ -2085,6 +2103,7 @@ addErrorDamageRemark(ti, tmpRow); var orgUnitName = $('#depart').text(); addToussItem(toussItem, sstsConfig.addTousseAtLastForRecycle, true, ti.id, msg.isFixedBarcode); + updateTousseIndex(); //未补充的丢失报损 loadUnSupplementMaterial(msg, tmpRow, ti.barcode); } @@ -3788,6 +3807,7 @@ loadUnSupplementMaterial(msgObj, tmpRow, ti.barcode); } noticeIdCardUseAmount(msgObj); + updateTousseIndex(); if (msgObj.isTousseNeedMaintain != null && msgObj.isTousseNeedMaintain == true) { alertDiv('\'' + msgObj.tousseInstance.tousseDefinition.name + '\'' + '需要保养了.'); } @@ -4126,6 +4146,8 @@ setTousseItemLoadedAmountCss(row); } } + + updateTousseIndex(); } }, error: function (XMLHttpRequest, textStatus, errorThrown) { @@ -4172,6 +4194,26 @@ } } +//ZSYY-385:更新序号 +function updateTousseIndex(){ + if(serialNumberBox || currentlyToBeRecycledBox){ + var sumRecycleAmount = 0; + var zIndex = $('#tousseItemTable').children().first().children().length; + $('#tousseItemTable').children().first().children().each(function (row, element) { + if ($('#deleted' + row).val() == '0') { + if(serialNumberBox){ + $('#index' + row).html(zIndex); + } + sumRecycleAmount += parseInt($('#recycleAmount' + row).val()); + zIndex --; + } + }) + if(currentlyToBeRecycledBox){ + $('#currentlyToBeRecycled').html(sumRecycleAmount); + } + } +} + /** * 添加回收记录明细,tousseName为器械包名称,applicationAmount为申请数量,recycleAmount为回收数量,loadedAmount为装载数量 * @param toussItem 物品明细 @@ -4373,8 +4415,11 @@ } var trStr = ''; trStr += ''; - trStr += '' + - '' + + trStr += ''; + if(serialNumberBox){ + trStr += ''; + } + trStr += '' + '' + '' + '' + @@ -5570,6 +5615,7 @@ //统一增加的原因,是防止下次去拿数据的时候,拿到刚增加进去的数据 addToussItem(addColumnObj, false); } + updateTousseIndex(); } @@ -6762,6 +6808,7 @@ }; addToussItem(toussItem, false); } + updateTousseIndex(); } } loadWashBasketsByDepartCode(departCode); @@ -6976,6 +7023,8 @@ row++; } } + + updateTousseIndex(); } } else { $("#depart").text(application.depart); @@ -7061,6 +7110,8 @@ ++row; } } + + updateTousseIndex(); //是否有丢失报损 var tousseBarcodes = application.tousseBarcodes; if (!isUndefinedOrNullOrEmpty(tousseBarcodes)) { @@ -7431,6 +7482,7 @@ lastRecyclingDate: tousseItem.lastRecyclingDate, recyclingDateDetails: tousseItem.recyclingDateDetails }; + if (application != null && application.applicationItems != null) { for (var k = 0; k < application.applicationItems.length; k++) { if (tousseItem.tousseDefinitionId == application.applicationItems[k].tousseDefinitionId) { @@ -7505,6 +7557,8 @@ } row++; } + + updateTousseIndex(); } var applicationitems = null; @@ -7589,6 +7643,8 @@ } } } + + updateTousseIndex(); } if (record.classifyBaskets != null) { for (var i = 0; i < record.classifyBaskets.length; i++) { @@ -7929,6 +7985,10 @@ } }, 1000); } + + if(currentlyToBeRecycledBox){ + $('.currentlyToBeRecycled').show(); + } }) function getDataset(ele){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r38007 -r39268 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 38007) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 39268) @@ -715,6 +715,13 @@ #recycleTimeListBox .title th { text-align: center; } + .currentlyToBeRecycled { + display: none; + } + .tousseIndex { + float: left; + line-height: 68px; + } @@ -762,6 +769,10 @@ +
+ 回收总包数: + 0 +
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp =================================================================== diff -u -r36011 -r39268 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 36011) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 39268) @@ -110,12 +110,14 @@ if(sstsConfig.enableUserManuallyCloseAddTousseWindow){ if(window.parent.addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){ window.parent.highlightExistTousseItem(row); + window.parent.updateTousseIndex(); }else { alertDiv(tousseName + ",回收列表已存在!"); } }else { if(window.parent.addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){ window.parent.highlightExistTousseItem(row); + window.parent.updateTousseIndex(); } closeLayer(); } Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js =================================================================== diff -u -r39172 -r39268 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 39172) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 39268) @@ -393,6 +393,8 @@ enableAnInstanceIsGeneratedAfterRecycled:true, //启用数据实时看板 enableRealTimeDashboardsForDataFunction:true, +//回收清点扩展字段配置 +expandFieldsOfRecycle:["currentlyToBeRecycled","serialNumber"], //器械包信息的默认查询数据排序方式 defaultSortingMethodOfTousseInstanceManager:"packing" } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp =================================================================== diff -u -r38671 -r39268 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 38671) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 39268) @@ -201,6 +201,9 @@ if(window.parent.updateBindGoods){ window.parent.updateBindGoods(row); } + if(window.parent.updateTousseIndex){ + window.parent.updateTousseIndex(); + } closeLayer(); }else if(inputObj.value != null && inputObj.value != "" && name != null && name != ''){ var result = window.parent.validateStuffInTheBasketAmount(tousseName,name,type,parseInt(inputObj.value,10));