Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r17218 -r17324 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 17218) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 17324) @@ -212,8 +212,8 @@ }); } -function loadIdCardByBarcode(barcodeField){ - var barcode = barcodeField.getValue(); +function loadIdCardByBarcode(tempBarcode){ + var barcode = tempBarcode; PackingTableManager.getIDCardInfoForPackingView(barcode,function(resultJsonStr){ var result = JSON.parse(resultJsonStr); @@ -249,7 +249,6 @@ Ext4.getCmp('idCardName').setValue(); } }); - barcodeField.setValue(); } function reSetParentNodeAmount(delNode){ @@ -346,7 +345,8 @@ {name : 'replenishMaterils'}, {name : 'haveIDCard'}, {name : 'uuid_vedioNames'}, - {name : 'isTimeout'} + {name : 'isTimeout'}, + {name : 'idCardBarcode'} ]}); function buildColumnTreeColumns(treeId){ @@ -842,7 +842,8 @@ listeners : { specialkey : function(thiz, e){ if(e.getKey() == 13){ - loadIdCardByBarcode(thiz); + loadIdCardByBarcode(thiz.getValue()); + thiz.setValue(); } } } @@ -1559,7 +1560,7 @@ function addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName, taskStatus,department,tousseType, packageType, sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors, - damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount){ + damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode){ var leaf = false; if(taskId != ''){ leaf = true; @@ -1590,7 +1591,8 @@ leaf : leaf, replenishMaterils : replenishMaterils, haveIDCard:haveIDCard, - uuid_vedioNames : videoNames + uuid_vedioNames : videoNames, + idCardBarcode : idCardBarcode }); if(!leaf){ node.set("checked" ,false); @@ -2394,6 +2396,11 @@ }); showPackButton(isPrint,isReview,tousseType); + var idCardBarcodeTemp = record.get("idCardBarcode"); + if(idCardBarcodeTemp != ""){ + loadIdCardByBarcode(idCardBarcodeTemp); + } + var isLeaf = record.get('leaf'); if(!isLeaf){ if(record.get('checked') == false){ @@ -2477,7 +2484,7 @@ if(parentNode == null){ parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','', '','',tousseType, packageType, - sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount); + sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,taskVO.idCardBarcode); newParentNode = true; } var cLength = taskVO.children.length; @@ -2516,7 +2523,7 @@ if(sigle){ var childNode = addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName, taskStatus,department,tousseType, packageType,sterilingMethod,dateTime,isTraceable,isPrint,isReview, - errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount); + errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode); parentNode.appendChild(childNode); var pNewAmount = parentNode.get('amount') + amount; parentNode.set('amount',pNewAmount);