Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r13830 -r13962 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 13830) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 13962) @@ -529,6 +529,8 @@ idCardInstanceID = result.idCard.id; // alert(idCardInstanceID) Ext4.getCmp('operatorBarcode').focus(); + // 做保养器械包的处理 + maintainTousse(); } else { @@ -1958,6 +1960,7 @@ var damages = taskNode.get("damages"); var errors = taskNode.get("errors"); var department = taskNode.get("department"); + // 装配 packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department); if(packed){ addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1); @@ -1970,6 +1973,25 @@ return packed; } +function maintainTousse(){ + // 判断是否保养 + var isMaintain = false; + DWREngine.setAsync(false); + PackingTableManager.isMaintainTousse(idCardInstanceID,function(result){ + isMaintain = result; + }); + DWREngine.setAsync(true); + if(isMaintain == true){ + Ext4.MessageBox.confirm("器械包需要保养", "是否保养?", + function(btn) { + if (btn == 'yes') { + addAndEditTousseMainTain(); + loadDataByIdCardInstanceID(idCardInstanceID,"到期添加"); + } + }); + } +} + function printTousseByNode(tousseNode){ var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); var packed = false;