Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r17133 -r17218 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 17133) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 17218) @@ -1390,23 +1390,36 @@ ctx.tdAttr = " data-qtip = '"+Ext4.String.htmlEncode(tableContent)+"' data-qwidth=350 data-qtitle='质量、功能检查:'"; return v; } + +var selModel = top.Ext4.create('top.Ext4.selection.CheckboxModel'); + var materialGrid = new Ext4.grid.Panel({ id :'materialGrid', store: materialStore, height : document.body.clientHeight-20, region: 'east', margin: '0 0 0 0', width : '22%', + selModel: selModel, tbar:[{ xtype:'button', id:"materialAmount" },'-',{ xtype:'button', id:"diposableGoodsAmount" + },'-',{ + xtype:'button', + text : '添加质量监测', + hidden:SSTS_QualityRecord_Create, + id:"addMaterialQualityMonitoring", + handler: function(){ + materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); + addQualityMonitoringByResponPart("清洗消毒"); + } }], columns: [ - {hidden : true, dataIndex : 'materialDefinitionId'}, + {hidden : true, dataIndex : 'materialDefinitionId'}, {header : "材料名称",width : 140,flex: 1,menuDisabled: true,dataIndex : 'name',renderer:gridItemRender}, {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count',renderer:gridItemRender} ], @@ -1473,8 +1486,8 @@ hidden:SSTS_QualityRecord_Create, iconCls : 'btn_ext_application_add', handler : function() { -// addQualityMonitoring(); - addQualityMonitoringByResponPart("装配管理"); + materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); + addQualityMonitoringByResponPart("清洗消毒"); } },"-",{ text : '打印回收清单',