Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js =================================================================== diff -u -r28682 -r28759 --- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js (.../terminateInvoicePlan.js) (revision 28682) +++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js (.../terminateInvoicePlan.js) (revision 28759) @@ -31,33 +31,31 @@ } var url = '/disinfectSystem/invoicePlanAction!terminateInvoicePlan.do'; if (records.length > 1) { - /*showResult("一次只能终止一个申请单"); - return false;*/ - - id = ""; + var ids = []; + var k = 0; for(var i = 0;i < records.length;i++){ - var endStatus = records[i].data['endStatus']; if(endStatus == "已终止"){ showResult("单号为" + records[i].data['serialNumber'] + "的申请单已终止!"); return false; } if(formType == 'invoicePlanGridId'){ - id += records[i].data['invoicePlanId']; + if(ids.indexOf(records[i].data['invoicePlanId']) == -1){ + ids[k] = records[i].data['invoicePlanId']; + k++; + } }else { - id += records[i].data['id']; + ids[i] = records[i].data['id']; } - if(i < records.length-1){ - id += ","; - } - } + } + id = ids.join(','); url = '/disinfectSystem/invoicePlanAction!terminateMultiInvoicePlans.do'; }else{ var endStatus = records[0].data['endStatus']; if(endStatus == "已终止"){ showResult("该申请单已终止!"); return false; - } + } } var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp", '','请选择终止原因', "760", "400");