Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r30136 -r30205 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30136) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30205) @@ -2446,13 +2446,27 @@ materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); otherPartAddQM = true; var washRecordIds = getWashRecordIds(); + var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked(); + var map = {},tousseItems = []; + Ext4.each(records, function(pNode){ + if(pNode.childNodes.length == 0){ + var ai = pNode; + if(!map[ai.get('tousseName')]){ + tousseItems.push({ + tousseName:ai.parentNode.get('tousseName'), + tousseID:ai.parentNode.get('tousseID') + }); + map[ai.get('tousseName')] = ai; + } + } + }); if(washRecordIds.length > 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); showResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); }else if(washRecordIds.length == 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); }else { - addQualityMonitoringByResponPart("清洗消毒"); + addQualityMonitoringByResponPart("清洗消毒",'',tousseItems); } } }], @@ -2572,14 +2586,28 @@ handler : function() { materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); otherPartAddQM = true; - var washRecordIds = getWashRecordIds(); + var washRecordIds = getWashRecordIds(); + var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked(); + var map = {},tousseItems = []; + Ext4.each(records, function(pNode){ + if(pNode.childNodes.length == 0){ + var ai = pNode; + if(!map[ai.get('tousseName')]){ + tousseItems.push({ + tousseName:ai.parentNode.get('tousseName'), + tousseID:ai.parentNode.get('tousseID') + }); + map[ai.get('tousseName')] = ai; + } + } + }); if(washRecordIds.length > 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); showResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); }else if(washRecordIds.length == 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); }else { - addQualityMonitoringByResponPart("清洗消毒"); + addQualityMonitoringByResponPart("清洗消毒",'',tousseItems); } } }/* ,"-",{