Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r15253 -r15267 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15253) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15267) @@ -343,25 +343,24 @@ return; } top.Ext.getCmp('position').setValue(result.name); -// var selNode = sterilizationColumnTree.getSelectionModel().getSelectedNode(); -// var root = sterilizationColumnTree.getRootNode(); -// if(selNode != null){ -// var insideTousse = selNode.attributes.insideTousse; -// alert(insideTousse) -// if(typeof(insideTousse) == 'undefined' || insideTousse == true){ -// // 篮筐和不入筐灭菌的器械包才修改位置 -// selNode.attributes.position = result.name; -// var newBasket = cloneBasketOrTousse(selNode); -// var curIndex = root.indexOf(selNode); -// var nextNode = selNode.nextSibling; -// root.removeChild(selNode); -// if(nextNode != null){ -// root.insertBefore(newBasket,nextNode); -// }else{ -// root.appendChild(newBasket); -// } -// } -// } + var selNode = sterilizationColumnTree.getSelectionModel().getSelectedNode(); + var root = sterilizationColumnTree.getRootNode(); + if(selNode != null){ + var insideTousse = selNode.attributes.insideTousse; + if(typeof(insideTousse) == 'undefined' || insideTousse == true){ + // 篮筐和不入筐灭菌的器械包才修改位置 + selNode.attributes.position = result.name; + var newBasket = cloneBasketOrTousse(selNode); + var curIndex = root.indexOf(selNode); + var nextNode = selNode.nextSibling; + root.removeChild(selNode); + if(nextNode != null){ + root.insertBefore(newBasket,nextNode); + }else{ + root.appendChild(newBasket); + } + } + } }else{ showResult('找不到该条码所对应的位置信息'); } @@ -376,24 +375,31 @@ var position = node.attributes.position; if(typeof(insideTousse) == 'undefined' || insideTousse == true){ // 单个器械包或者篮筐 - alert(type) if(type == '器械包'){ var cloneNode = createNode(true,barcode,name,depart,'器械包',true,position); return cloneNode; }else{ var cloneNode = createNode(true,barcode,name,'','篮筐',true,position); - var childNodes = node.childNodes; - var childNodesAppend = []; + var childNodes = node.attributes.children; if(childNodes != null){ for(var i=0;i 0){ + for(var i=0;i