Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r33504 -r33505 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33504) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33505) @@ -587,12 +587,12 @@ var basketTree = Ext4.getCmp('basketTreeGrid'); var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); Ext4.each(basketTree.getView().getChecked(), function (pNode) { - if (pNode.childNodes.length !== 1 && idCardTaskNode.get('tousseName') != pNode.get('tousseName')) { + if (pNode.childNodes.length !== 1 && idCardTaskNode.data.tousseName != pNode.get('tousseName')) { pNode.set("checked", false); } }); Ext4.each(waitPackingTreeGrid.getView().getChecked(), function (pNode) { - if (idCardTaskNode.get('tousseName') != pNode.get('tousseName')) { + if (idCardTaskNode.data.tousseName != pNode.get('tousseName')) { pNode.set("checked", false); } }); @@ -759,7 +759,7 @@ return; } } - var taskId = idCardTaskNode.get('taskId'); + var taskId = idCardTaskNode.data.taskId; onErrorDamageBtnClick(type, taskId); } function reSetParentNodeAmount(delNode) { @@ -1731,13 +1731,13 @@ } // 校验材料是否有丢失和报损还未补充 function validateSupplement(cNode) { - var tousseName = cNode.get("tousseName"); - var status = cNode.get("status"); - var basketBarcode = cNode.get("basketBarcode"); - var taskId = cNode.get("taskId"); - var tousseType = cNode.get("tousseType"); - var damages = cNode.get("damages"); - var errors = cNode.get("errors"); + var tousseName = cNode.data.tousseName; + var status = cNode.data.status; + var basketBarcode = cNode.data.basketBarcode; + var taskId = cNode.data.taskId; + var tousseType = cNode.data.tousseType; + var damages = cNode.data.damages; + var errors = cNode.data.errors; if (status == '待确认') { showResult(tousseName + ",有器械丢失,请确认!", null, sstsConfig.messagePauseTimeOnPackingPage); @@ -3419,8 +3419,8 @@ function printTousseByIDcardTaskNode(taskNode) { var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); var packed = false; - var tousseName = taskNode.get("tousseName"); - var amount = taskNode.get("amount"); + var tousseName = taskNode.data.tousseName; + var amount = taskNode.data.amount; var tousseItemsToDelete = new Array(); setTousseItemsToDelete(tousseItemsToDelete, tousseName); var basketTree = Ext4.getCmp('basketTreeGrid'); @@ -3438,23 +3438,23 @@ // alert('useViewingPackageType') } - var tousseName = taskNode.get("tousseName"); - var status = taskNode.get("status"); - var basketBarcode = taskNode.get("basketBarcode"); - var taskId = taskNode.get("taskId"); + var tousseName = taskNode.data.amount; + var status = taskNode.data.status; + var basketBarcode = taskNode.data.basketBarcode; + var taskId = taskNode.data.taskId; - var packageType = taskNode.get("packageType"); + var packageType = taskNode.data.packageType; packageType = Ext4.getCmp('packageType').getValue(); - var sterilingType = taskNode.get("sterilingMethod"); + var sterilingType = taskNode.data.sterilingMethod; sterilingType = Ext4.getCmp('sterilingType').getValue(); var sType = Ext4.getCmp('sterilingType'); - var tousseType = taskNode.get("tousseType"); - var supplierName = taskNode.get("supplierName"); - var damages = taskNode.get("damages"); - var errors = taskNode.get("errors"); - var department = taskNode.get("department"); - var urgentAmount = taskNode.get("urgentAmount"); - var tousseID = taskNode.get("tousseID"); + var tousseType = taskNode.data.tousseType; + var supplierName = taskNode.data.supplierName; + var damages = taskNode.data.damages; + var errors = taskNode.data.errors; + var department = taskNode.data.department; + var urgentAmount = taskNode.data.urgentAmount; + var tousseID = taskNode.data.tousseID; var taskIdToAmountMapInfo = [{ taskId: taskId, amount: amount,