Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp =================================================================== diff -u -r32147 -r32538 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 32147) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 32538) @@ -70,15 +70,17 @@ var materials = new Array(); var msg = ""; - var i = 1; + var i = 0; + var remarksArr = []; $("#recyclingErrorTable tr").each(function () { - if(i > 1){ - var materialInstanceId = $(this).find("input:first").val(); - var materialName = $(this).find("td:nth-child(3)").html(); - var includeImplant = $(this).find("td:nth-child(4)").html(); - var amount = parseInt($(this).find("td:nth-child(6)").html(),10); - var minDismantleAmount = $(this).find("td:nth-child(8)").html(); - var usedAmountOfIncludeImplant = $(this).find("td:nth-child(9)").html(); + if(i > 0){ + var materialInstanceId = $('#materialInstanceId'+i).val(); + var remark = $('#remarks'+i).val(); + var materialName = $('#materialName'+i).html(); + var includeImplant = $('#includeImplant'+i).html(); + var amount = parseInt($('#amount'+i).html(),10); + var minDismantleAmount = $('#minDismantleAmount'+i).html(); + var usedAmountOfIncludeImplant = $('#usedAmountOfIncludeImplant'+i).html(); if(materialName == ""){ msg = "外来器械材料必须填写名称！"; @@ -91,6 +93,7 @@ materials.push({ materialInstanceId : materialInstanceId, materialName : materialName, + remark:remark, amount : amount, includeImplant : includeImplant, minDismantleAmount : minDismantleAmount, @@ -105,7 +108,6 @@ return false; } - var price = $('#price0').text(); var amount = $('#amount0').text(); @@ -130,14 +132,15 @@ var rowNum = $("#recyclingErrorTable tr").length; var materialElement = $('' + '' + + '' + ' ' + '' + '否' + '0' - + '0' + + '0' + ' ' + ' ' - + '' + + '' + '-' + ''); $("#recyclingErrorTable").append(materialElement); @@ -152,9 +155,13 @@ } } + function setRemarks(row,remark){ + $('#remarks'+row).val(remark) + } + //打开编辑数量页面 var openElement; - function openUpdateAmount(obj,row){ + function openUpdateAmount(obj,row,updateType){ obj.blur(); var designedTousseWidth = 980; var designedTousseHeight = 700; @@ -180,15 +187,46 @@ height = (clientHeight) > 600 ? 600 : (clientHeight - 250); top = 100; } + var recycleAmount_old = $('#amount'+row).text(); + var usedAmountOfIncludeImplant_old = $('#usedAmountOfIncludeImplant'+row).text(); + var recyclingTimes = 1; + if(recyclingStatus == '待回收' && $('#includeImplant'+row).text() == '否' && updateType == 0){ + recyclingTimes = 2; + } openElement = obj; $.layer({ type : 2, title : ['修改数量',true], - iframe : {src : 'updateAmount.jsp?from=errors&resolution=${param.resolution}&row='+row}, + iframe : {src : 'updateAmount.jsp?from=errors&resolution=${param.resolution}&row='+row+'&recyclingTimes='+recyclingTimes}, area : [width + 'px' , height + 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true], - offset : [top+'px',''] + offset : [top+'px',''], + end:function(){ + if($('#includeImplant'+row).text() == '是' && recyclingStatus == '待回收'){ + if(updateType == 0){ + var recycleAmount_new = $('#amount'+row).text(); + var value = parseInt(recycleAmount_new) - parseInt(recycleAmount_old); + if(value > parseInt(usedAmountOfIncludeImplant_old)){ + $('#amount'+row).text(recycleAmount_old) + alert('回收增加的数量不能超过使用数量'); + return + } + var usedAmountOfIncludeImplant_new = usedAmountOfIncludeImplant_old - value; + $('#usedAmountOfIncludeImplant'+row).text(usedAmountOfIncludeImplant_new); + }else if(updateType == 1){ + var usedAmountOfIncludeImplant_new = $('#usedAmountOfIncludeImplant'+row).text(); + var value = parseInt(usedAmountOfIncludeImplant_new) - parseInt(usedAmountOfIncludeImplant_old); + if(value > parseInt(recycleAmount_old)){ + $('#usedAmountOfIncludeImplant'+row).text(usedAmountOfIncludeImplant_old) + alert('使用增加的数量不能超过回收数量'); + return + } + var recycleAmount_new = recycleAmount_old - value; + $('#amount'+row).text(recycleAmount_new); + } + } + } }); } @@ -273,15 +311,16 @@ var materialElement = $('' + '' + + '' + ' ' + '' + materialItem.tousseName + '' + '' + materialItem.includeImplant + '' + '' + applyAmount + '' - + '' + recycleAmount + '' + + '' + recycleAmount + '' + ' ' - + ''+minDismantleAmount+'' - + '' + + ''+minDismantleAmount+'' + + '' + materialItem.usedAmountOfIncludeImplant + '' + '-' Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp =================================================================== diff -u -r30790 -r32538 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 30790) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 32538) @@ -21,6 +21,7 @@ var recycleAmount = parseInt('${param.recycleAmount}'); var loadedAmount = parseInt('${param.loadedAmount}'); var customAmountSubmit = '${param.customAmountSubmit}'; +var recyclingTimes = '${param.recyclingTimes}'; var parentrecycleAudioAmount = $(window.parent.document).find("#recycleAudioAmount"); var isOpenUpdateAmount = $(window.parent.document).find("#isOpenUpdateAmount").val(); var isDialogStatus = $(window.parent.document).find("#isDialogStatus").val(); @@ -61,9 +62,10 @@ parent.layer.close(index); } } - function submitButton(inputObj){ + function submitButton(inputObj,updateResult){ if(inputObj.value != null && inputObj.value != ""){ window.parent.openElement.innerText = inputObj.value; + window.parent.setRemarks(row,updateResult); confirmNUm(inputObj.value,'audioNum'); closeLayer(); } @@ -103,7 +105,15 @@ function okData(){ var inputObj = document.getElementById('inputText'); if(from == "errors"){ - submitButton(inputObj); + var updateResult = ''; + if(recyclingTimes == 2){ + updateResult = $('#updateResult').val(); + if(updateResult == ''){ + alert('请填写修改原因'); + return; + } + } + submitButton(inputObj,updateResult); return; }else if(from == 'customLoadedAmount'){ if(inputObj.value != null && inputObj.value != "" && row != null && row != ''){ @@ -176,6 +186,9 @@ }else{ el.style.display='none'; } + if(recyclingTimes == 2){ + $('.result').show(); + } } function ChangeRatio(type){ @@ -293,6 +306,10 @@ +