Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r33935 -r34209 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33935) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 34209) @@ -1826,6 +1826,9 @@ xtype: 'hidden', id: 'packedPhotographed', name: 'packedPhotographed' + },{ + xtype:'hidden', + id:'note' }, { columnWidth: .5, hidden: sstsConfig.disableIdCard, @@ -3213,24 +3216,31 @@ return; } var checked = node.get('checked'); - + var tousseName = node.get('tousseName'); var note = node.get('note'); - // alert(note+','+checked) if (!Ext.isEmpty(note) && checked) { - var width = Ext4.getCmp('materialGrid').getSize().width; - alertDiv(note, width); + $('#hiddenNote').val(note); + Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项,是否查看?",function (btn) { + if (btn == 'yes') { + previewWangEditor('【'+tousseName+'】'); + } + }); } } function updateNoteWindow(record) { if (!sstsConfig.showTousseNoteOnClickTousse) { return; } var note = record.data['note'];//配包注意事项 - // if(!Ext.isEmpty(note)){ - // }else{ - // hide(); - // } - updateNote(note); + var tousseName = record.data['tousseName']; + if (!Ext.isEmpty(note)) { + $('#hiddenNote').val(note); + Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项,是否查看?",function (btn) { + if (btn == 'yes') { + previewWangEditor('【'+tousseName+'】'); + } + }); + } } function getSelAmount() { var basketTree = Ext4.getCmp('basketTreeGrid');