Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r32574 -r32610 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32574) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32610) @@ -2705,37 +2705,6 @@ reflushWaitPackingTreeGrid(); } },"-",{ - text : '删除', - hidden:SSTS_PackingTask_Delete, - iconCls : 'btn_ext_application_del', - handler : function() { - var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); - var selNodes = waitPackingTreeGrid.getView().getChecked(); - if(selNodes.length == 0){ - showResult('请先选择需要删除的待装配任务'); - return; - } - var ids = ""; - Ext4.each(selNodes, function(pNode) { - if(pNode.childNodes.length > 0){ - Ext4.each(pNode.childNodes, function(cNode){ - var taskId = cNode.get('taskId'); - if(ids != ""){ - ids += ";"; - } - ids += taskId; - }); - }else { - var taskId = pNode.get('taskId'); - if(ids != ""){ - ids += ";"; - } - ids += taskId; - } - }); - deletePackingTask(ids,null,null,true,null); - } -},"-",{ text : '添加报损器械', hidden : SSTS_QualityRecord_Create, iconCls : 'btn_ext_application_add', @@ -2782,14 +2751,38 @@ addQualityMonitoringByResponPart(responsibilityPart,'',tousseItems); } } -}/* ,"-",{ - text : '打印回收清单', - hidden:SSTS_RecyclingDetail_Print, - iconCls : 'icon_print', +},"-",{ + text : '删除', + hidden:SSTS_PackingTask_Delete, + iconCls : 'btn_ext_application_del', handler : function() { - recyclingDetailWindow(); + var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); + var selNodes = waitPackingTreeGrid.getView().getChecked(); + if(selNodes.length == 0){ + showResult('请先选择需要删除的待装配任务'); + return; + } + var ids = ""; + Ext4.each(selNodes, function(pNode) { + if(pNode.childNodes.length > 0){ + Ext4.each(pNode.childNodes, function(cNode){ + var taskId = cNode.get('taskId'); + if(ids != ""){ + ids += ";"; + } + ids += taskId; + }); + }else { + var taskId = pNode.get('taskId'); + if(ids != ""){ + ids += ";"; + } + ids += taskId; + } + }); + deletePackingTask(ids,null,null,true,null); } -} */]; +}]; var basketStore = new Ext4.data.TreeStore({ model: cModel,