Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r18266 -r18267 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18266) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18267) @@ -2061,16 +2061,32 @@ if(totalCheckedNodesLength != 1){ return false; } + var basketTreeGridSelectionNodes = basketTreeGrid.getView().getSelectionModel().getSelection(); + var waitPackingTreeSelectionNodes = waitPackingTreeGrid.getView().getSelectionModel().getSelection(); + var totalSelectionNodesLength = basketTreeGridSelectionNodes.length + waitPackingTreeSelectionNodes.length; + if(totalSelectionNodesLength != 1){ + return false; + } var checkedNode = null; if(basketTreeGridCheckedNodes.length > 0){ checkedNode = basketTreeGridCheckedNodes[0]; }else{ checkedNode = waitPackingTreeCheckedNodes[0]; } - var tousseName = checkedNode.get("tousseName"); - if(tousseName != lastSelectedTousseName){ + var selectionNode = null; + if(basketTreeGridSelectionNodes.length > 0){ + selectionNode = basketTreeGridSelectionNodes[0]; + }else{ + selectionNode = waitPackingTreeSelectionNodes[0]; + } + if(checkedNode != selectionNode ){ +// alert('checkedNode != selectionNode') return false; } +// var tousseName = checkedNode.get("tousseName"); +// if(tousseName != lastSelectedTousseName){ +// return false; +// } // alert('useManualSelectPackageType'); return true; } @@ -2866,10 +2882,7 @@ }, checkchange:function( node, checked, eOpts ){ - if(node.get != undefined){ - var tousseName = node.get('tousseName'); - lastSelectedTousseName = tousseName; - } + resetScanIDCardBarcodeVisibility(node); setPackageTypeReadOnlyByCondition(); clearRemarkByCondition(); @@ -3151,10 +3164,7 @@ } }, checkchange:function( node, checked, eOpts ){ - if(node.get != undefined){ - var tousseName = node.get('tousseName'); - lastSelectedTousseName = tousseName; - } +// resetScanIDCardBarcodeVisibilityWaitPacking(node); setPackageTypeReadOnlyByCondition(); clearRemarkByCondition();