Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r32798 -r32805 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32798) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32805) @@ -356,9 +356,7 @@ newParams.tousseType = params.tousseType1; var node = Ext4.create('cModel',newParams); - if(!leaf){ - node.set("checked" ,false); - } + node.set("checked" ,false); return node; } @@ -2316,6 +2314,7 @@ id :"save_print", text:'' + packingBtnText + '', handler : function() { + reloadBasketTreeGrid(false);return packingTousseBtnClick0(this,true); // packing = true; // this.disable(); @@ -4681,6 +4680,7 @@ }else { removeArr.push(pNode.childNodes[i]) pNode.set('amount',parentAmout-maxAmount); + pNode.set('maxAmount',parentMaxAmount-parentAmout); } } } @@ -4931,6 +4931,7 @@ cNode.set('basketName',cNodeBasketName+';'+basketName); cNode.set('basketBarcode',cNodeBasketBarcode+';'+basketBarcode); } + cNode.set('check',parentNode.get('checked')); } break; } @@ -6353,6 +6354,7 @@ errorDamageRemarkId:'', errorDamageRemarkInfo:'', tousseID:td_id, + maxAmount:0, needInspectMaterials:needInspectMaterials } parentNode = addTaskNode(params); @@ -6400,7 +6402,8 @@ var replenishMaterils = task.replenishMaterils; var taskType = task.taskType; var supplierName = task.supplierName; - var packageSize = task.packageSize; + var packageSize = task.packageSize; + var maxAmount = task.maxAmount; if(task.tousseType == '外来器械包'){ haveForeignTousseNode = true; @@ -6430,11 +6433,13 @@ task.tousseType1 = tousseType; task.packageType = packageType; task.sterilingMethod = sterilingMethod; + task.maxAmount = maxAmount; var childNode = addTaskNode(task); parentNode.appendChild(childNode); var pNewAmount = parentNode.get('amount') + amount; parentNode.set('amount',pNewAmount); + parentNode.set('maxAmount',pNewAmount); parentNode.set('unPackingAmount',pNewAmount); } }