Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r35014 -r35020 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35014) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35020) @@ -3784,22 +3784,28 @@ } // 校验是否有选中包 function ifCheckedForeignTousse() { - var bRet = false; var basketTree = Ext4.getCmp('basketTreeGrid'); - var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); var selNodes = basketTree.getView().getChecked(); - var selLength = selNodes.length; + var arr = []; //遍历器械包节点 Ext4.each(selNodes, function (pNode) { var tousseType = pNode.get('tousseType'); var tousseName = pNode.get('tousseName'); if(sstsConfig.packingView_confirmIndicatorCard && sstsConfig.packingView_confirmIndicatorCard.indexOf(tousseType) >= 0){ - bRet = tousseName; - return false; + if(arr.indexOf(tousseName) == -1){ + arr.push(tousseName); + } } }); - return bRet; + if(arr.length == 0){ + return false; + }else if(arr.length > 20){ + var newArr = arr.slice(0,20); + return (newArr.join('、')) + '.....'; + }else { + return arr.join('、'); + } } // 校验是否有选中的装配任务包装类型为空 function ifCheckedPackingTasksHaveEmptyPackageType() {