Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js =================================================================== diff -u -r40393 -r40437 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 40393) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 40437) @@ -398,13 +398,24 @@ // 更新器械包 function updateTousseInstanceForModifyPackingRecord(tousseInstanceIDs,modificationInfo,onUpdateFun,saveType){ DWREngine.setAsync(false); + modificationInfo.print = false; + if(saveType == 1){ + modificationInfo.print = true; + } var modificationInfoStr = JSON.stringify(modificationInfo); PackingTableManager.updateTousseInstanceForModifyPackingRecord(modificationInfoStr,tousseInstanceIDs,function(result){ if(result!=null && result.length > 0){ if(result == "success"){ showResult("更新成功!" , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ - showResult(result , null , sstsConfig.messagePauseTimeOnPackingPage); + var resultObj = Ext.decode(result); + if(resultObj.success && resultObj.data){ + showResult("更新成功!" , null , sstsConfig.messagePauseTimeOnPackingPage); + if(onUpdateFun != undefined){ + onUpdateFun(saveType, resultObj.data); + return; + } + } } }else{ showResult("更新失败!" , null , sstsConfig.messagePauseTimeOnPackingPage); Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r40429 -r40437 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 40429) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 40437) @@ -1839,26 +1839,11 @@ if(records.length == 1){ remark = records[0].data.remark; } - showModifyTousseInstancesWindow(tousseInstanceIDs,remark,function(saveType){ + showModifyTousseInstancesWindow(tousseInstanceIDs,remark,function(saveType,tousses){ grid.dwrReload(); if(saveType == 1){ - if(sstsConfig.enableRepeatPrintingLabelsAddQualityMonitoringFunction){ - var records = rePrintGrid.getSelectionModel().getSelections(); - var idsArr = [] - for(var i=0;i