Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r14318 -r14339 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 14318) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 14339) @@ -1104,7 +1104,8 @@ function openSetUrgentAmountPage(row){ - if(params_id != ''){ + var tousseItemId = $('#tousseItemId'+row).val(); + if(tousseItemId != ''){ return false; } @@ -1617,7 +1618,7 @@ }else{ var bgMsg = "background-image:url(unUrgentBg.png);"; var msg = "+"; - if(params_id != ''){ + if(tousseItemId != ''){ bgMsg = ""; msg = ""; } @@ -1733,22 +1734,23 @@ */ function getUrgentTousseItems(){ var urgentItemJsonArray = new Array(); - if(params_id == ''){ - $('#tousseItemTable').children().first().children().each(function(index,element){ - if($('#deleted'+index).val() == '0'){ - var tousseName = $('#tousseName'+index).val(); - var tousseDefinitionID = $('#tousseDefinitionID'+index).val(); - var originalUrgentAmount = parseInt($('#originalUrgentAmount'+index).val(),10); - var urgentAmount = parseInt($('#urgentAmount'+index).val(),10); - - urgentItemJsonArray.push({ - tousseName:tousseName, - tousseDefinitionID:tousseDefinitionID, - urgentAmount:urgentAmount - }); - } - }); - } + $('#tousseItemTable').children().first().children().each(function(index,element){ + if($('#deleted'+index).val() == '0'){ + var tousseName = $('#tousseName'+index).val(); + var tousseDefinitionID = $('#tousseDefinitionID'+index).val(); + var originalUrgentAmount = parseInt($('#originalUrgentAmount'+index).val(),10); + var urgentAmount = parseInt($('#urgentAmount'+index).val(),10); + var tousseItemId = $('#tousseItemId'+index).val(); + //已保存的tousseItem不能再修改 + if(tousseItemId == ""){ + urgentItemJsonArray.push({ + tousseName:tousseName, + tousseDefinitionID:tousseDefinitionID, + urgentAmount:urgentAmount + }); + } + } + }); return urgentItemJsonArray; } @@ -2231,8 +2233,7 @@ if (sstsConfig.showSettleAccountsDepartInRecycling){ $("#depart").val(application.settleAccountsDepart); $("#departCode").val(application.settleAccountsDepartCoding); - } - else{ + }else{ $("#depart").val(application.depart); $("#departCode").val(application.departCoding); }