Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r33191 -r33217 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33191) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33217) @@ -2128,17 +2128,17 @@ } if ($('#appType').val() == "申请还物单") { var isAlert = true; - if(msg.idCardInstance){ + if (msg.idCardInstance) { $("#tousseItemTable > tbody > tr").each(function (row, element) { var tousseName = $('#tousseName' + row).val(); - if(tousseName == msg.idCardInstance.tousseName && msg.idCardInstance.barcode !== ''){ + if (tousseName == msg.idCardInstance.tousseName && msg.idCardInstance.barcode !== '') { isAlert = false; } }) } - if(isAlert){ + if (isAlert) { alertDiv("申请还物单不允许添加新的物品,只能回收申请单中的物品!"); - return false; + return false; } } @@ -3405,9 +3405,9 @@ if ($('#tousseName' + i).val() == td.name && $('#deleted' + i).val() == '0') { tousseIsExist = true; $('#loadedAmount' + i).val(loadedAmount + parseInt($('#loadedAmount' + i).val(), 10)); - if(idCardInstance && (idCardInstance.barcode == ti.barcode)){ + if (idCardInstance && (idCardInstance.barcode == ti.barcode)) { $('#tousseOrIDCardInstanceBarcodes' + i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes' + i).val(), ti.barcode)); - } + } if (parseInt($('#loadedAmount' + i).val()) > parseInt($('#recycleAmount' + i).val())) { $('#recycleAmount' + i).val(parseInt($('#loadedAmount' + i).val())); } @@ -4872,7 +4872,7 @@ var jsonStr = getJsonParams(confirmation, isConfirm); if (jsonStr == '') { return; } var jSONe = JSON.parse(jsonStr); - //console.log(jSONe);return + //console.log(jSONe); return alertDiv("保存中,请稍候......", true); if (IntheBoxState == true) { jSONe.tally = true;