Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r22763 -r22905 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 22763) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 22905) @@ -362,6 +362,7 @@ deleteBasket(deleteButton,basketBarcode,basketId); } refreshSplitBasketView(); + refreshAllBasketTotalNum(); $(this).dialog("close"); },"否": function() { $(this).dialog("close"); @@ -560,6 +561,31 @@ } } } +/** + * 刷新对应篮筐的包与材料总数量 + * @param liElement + */ +function refreshBasketTotalNum(liElement){ + if(liElement){ + var total = 0; + liElement.find('dd.num').each(function(){ + var num = parseInt($(this).html()); + if(num){ + total += num; + } + }); + liElement.find('font.totalnum').html(total); + } +} +/** + * 刷新所有篮筐的包与材料总数量 + */ +function refreshAllBasketTotalNum(){ + $("#basketsUl li").each(function(){ + refreshBasketTotalNum($(this)); + }); +} + //删除篮筐中的物品 function deleteBasketItem(deleteButton){ var hideElement = $(deleteButton).parent().prev().prev().prev().prev(); @@ -569,7 +595,7 @@ var delElement = $(deleteButton).parent(); var basketElement = $(deleteButton).parent().parent(); - var basketJSON = basketElement.prev().prev().prev().prev(); + var basketJSON = basketElement.prev().prev().prev().prev().prev(); var basket = basketJSON.val()?JSON.parse(basketJSON.val()):{}; var item = hideElement.val()?JSON.parse(hideElement.val()):{}; var name = ""; @@ -582,7 +608,7 @@ name = item.materialName; tousseNameForMaterial = item.tousseName; $('dl[class="sed clearfix"]').each(function(){ - var basketEle = $(this).prev().prev().prev().prev().val(); + var basketEle = $(this).prev().prev().prev().prev().prev().val(); var basketJSON = JSON.parse(basketEle); $(this).children().each(function(){ if($(this).attr('type') == 'hidden'){ @@ -898,6 +924,7 @@ } basketElement += '' + (sequence&&sequence>0?(sequence+'.' + basketName):basketName) + '      ' + imageButton +''; + basketElement += '' + 0 + ''; basketElement += '
'; basketElement += ''; var obj = $(basketElement); @@ -2229,7 +2256,7 @@ ''+ reduceButton + ''+ - '入筐'+ + '入筐'+ '丢失'+ '报损'+ '删除'; @@ -2844,6 +2871,7 @@ } } }); + refreshAllBasketTotalNum(); } function cancel(){ @@ -3041,7 +3069,6 @@ offset : [offsetTop+'px',''] }); } - function customIntoBasketFun(data){ if(data != null){ for(var j = 0;j < data.length;j++){ @@ -3114,8 +3141,8 @@ return false; } }); - } + refreshAllBasketTotalNum(); refreshSplitBasketView(); } } @@ -3509,6 +3536,7 @@ $('#saveAndPrintBtnTd').hide(); } refreshSplitBasketView(); + refreshAllBasketTotalNum(); if('history' != params_recordType || !getSystemSetConfig('confirmRecyclingAmount',true)){ $('div.communicationUserName').hide(); $('#recyclingAmountConfirm').hide(); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r21085 -r22905 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 21085) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 22905) @@ -105,6 +105,7 @@ } }); refreshBasketStatus(); + refreshAllBasketTotalNum(); } function removeImplants(removeBtn){ var liElement = $(removeBtn).parent().parent(); @@ -118,6 +119,7 @@ } }); refreshBasketStatus(); + refreshAllBasketTotalNum(); } //删除篮筐中的物品 function deleteBasketItem(deleteButton){ @@ -257,6 +259,7 @@ basketElement += ''; basketElement += ''; basketElement += '
'+basketItem.containerName+'
' + basketElement += '' + 0 + ''; basketElement += '
'; basketElement += ''; var obj = $(basketElement); @@ -267,6 +270,7 @@ toggleItems(obj.find('span')[0]); } refreshBasketStatus(); + refreshAllBasketTotalNum(); }else{ alertDiv('没有找到该条码所对应的信息。'); } @@ -463,7 +467,7 @@ element += '
' + showName + '
'; element += '
' + materialName + '
'; element += '
' + materialAmount + '
'; - element += '
删除
'; + element += '
删除
'; var json = getBasketItemJSON(tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,idCardBarcode, putBasketMaxAmount,materialInstanceId,isImplant,tousseType); basketElement.prepend($(element)); @@ -590,6 +594,7 @@ function putMaterialInBasketWithAmount(row,amount){ putMaterialInBasket(row,false,amount); refreshBasketStatus(); + refreshAllBasketTotalNum(); } function deleteTousseItem(row){ @@ -713,7 +718,7 @@ ''+ '-'+ ''+ - '入筐'+ + '入筐'+ ''); $("#tousseItemTable").append(trElement); return true; @@ -838,6 +843,7 @@ } }); refreshBasketStatus(); + refreshAllBasketTotalNum(); sortBasket(); } /** @@ -959,6 +965,32 @@ updateClassifyBasketSequence(); } /** + * 刷新篮筐材料总数量 + * @param liElement + * @returns + */ +function refreshBasketTotalNum(liElement){ + if(liElement){ + var total = 0; + liElement.find('dd.materialNum').each(function(){ + var num = parseInt($(this).html()); + if(num){ + total += num; + } + }); + liElement.find('font.totalnum').html(total); + } +} +/** + * 刷新所有篮筐的器械总数 + * @returns + */ +function refreshAllBasketTotalNum(){ + $("#basketsUl li").each(function(){ + refreshBasketTotalNum($(this)); + }); +} +/** * 更新移除植入物按钮。如果有配置,则显示移除植入物按钮,否则隐藏起来并调整样式 * @param liElement * @param hasImplant @@ -967,10 +999,12 @@ function updateRemoveImplantBtn(liElement,hasImplant){ if(sstsConfig.showSplitInfoInCustomIntoBasket){ liElement.find('.btn-removeImplant').show(); + liElement.find('.totalnum').hide(); liElement.find('i').css("text-align","right"); liElement.find('i').css("width","223px"); }else{ liElement.find('.btn-removeImplant').hide(); + liElement.find('.totalnum').show(); liElement.find('i').css("text-align","center"); liElement.find('i').css("width","129px"); } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r19703 -r22905 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 19703) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 22905) @@ -75,6 +75,15 @@ color:red; float:right; } +.totalnum{ + display:inline-block; + text-align:center; + float:right; + width:86px; + height:58px; + overflow:hidden; + margin: 0px; +}