Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r21611 -r21626 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 21611) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 21626) @@ -485,7 +485,8 @@ {name : 'urgentLevel'}, {name : 'idCardBarcode'}, {name : 'customSplitBasketAmount'}, - {name : 'serialNumber'} + {name : 'serialNumber'}, + {name : 'note'} ]}); function buildColumnTreeColumns(treeId){ @@ -2127,6 +2128,29 @@ hideScanIDCardBarcode(); // 只要左边有选中的项,那么隐藏标识牌输入框 } } +function showNoteWindow(node){ + if(!sstsConfig.showTousseNoteOnClickTousse){ + return; + } + var checked = node.get('checked'); +// alert(node+','+checked) + var note = node.get('note'); + if(!Ext.isEmpty(note) && checked){ + var width = Ext4.getCmp('materialGrid').getSize().width; + alertDiv(note,width); + } +} +function updateNoteWindow(record){ + if(!sstsConfig.showTousseNoteOnClickTousse){ + return; + } + var note = record.data['note'];//配包注意事项 +// if(!Ext.isEmpty(note)){ +// }else{ +// hide(); +// } + updateNote(note); +} function getSelAmount(){ var basketTree = Ext4.getCmp('basketTreeGrid'); var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); @@ -3178,6 +3202,7 @@ var isReview = record.get('isReview'); var vedioName = record.get('uuid_vedioNames'); var td_id = record.get('tousseID'); + updateNoteWindow(record); loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id); if(packingPageAutoSetSterilizationProgramAfterSelectTousse){ Ext4.getCmp('sterilingType').setValue(sterilingMethod); @@ -3201,15 +3226,15 @@ if(!isLeaf){ if(record.get('checked') == false){ record.set('checked', true); - basketColumnTreeGrid.getView().fireEvent('checkchange'); + basketColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked')); } }else{ return false; } }, checkchange:function( node, checked, eOpts ){ - + showNoteWindow(node, checked); resetScanIDCardBarcodeVisibility(node); setPackageTypeReadOnlyByCondition(); clearRemarkByCondition(); @@ -3481,6 +3506,8 @@ var isReview = record.get('isReview'); var vedioName = record.get('uuid_vedioNames'); var td_id = record.get('tousseID'); + updateNoteWindow(record); + loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id); if(packingPageAutoSetSterilizationProgramAfterSelectTousse){ Ext4.getCmp('sterilingType').setValue(sterilingMethod); @@ -3515,14 +3542,14 @@ if(!isLeaf){ if(record.get('checked') == false){ record.set('checked', true); - waitPackColumnTreeGrid.getView().fireEvent('checkchange'); + waitPackColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked')); } }else{ return false; } }, checkchange:function( node, checked, eOpts ){ -// + showNoteWindow(node, checked); resetScanIDCardBarcodeVisibilityWaitPacking(node); setPackageTypeReadOnlyByCondition(); clearRemarkByCondition(); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java =================================================================== diff -u -r21495 -r21626 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java (.../WaitPackingTaskVo.java) (revision 21495) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java (.../WaitPackingTaskVo.java) (revision 21626) @@ -79,7 +79,7 @@ */ private long customSplitBasketAmount = 0; private List children = new ArrayList(); - + private String note; public String getTousseName() { return tousseName; } @@ -303,6 +303,14 @@ public void setCustomSplitBasketAmount(long customSplitBasketAmount) { this.customSplitBasketAmount = customSplitBasketAmount; } + + public String getNote() { + return note; + } + + public void setNote(String note) { + this.note = note; + } } Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js =================================================================== diff -u -r21617 -r21626 --- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 21617) +++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 21626) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 禁用标识牌功能 disableIdCard : false, // 回收时科室显示结算科室 @@ -52,6 +52,8 @@ recycleClassifyBasketAfterPacked:false, //发货时针对有植入物的器械包,是否要提示生物监测的情况 biologicalMonitoringEnable:true, + // 点击器械包时显示注意事项 + showTousseNoteOnClickTousse: true, //外来器械申请时显示原始包定义还是显示最近一次申请的包定义 isShowForeignTousseAncestorDefinitionForApply:true, //发货管理界面,是否启用发货物品汇总功能 Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r21472 -r21626 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 21472) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 21626) @@ -93,9 +93,28 @@ } - + + + + + + + @@ -124,8 +143,69 @@ + + + + + +