Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r16702 -r16737 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16702) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16737) @@ -471,7 +471,10 @@ ]); - +/** + * 处理多个器械包的灭菌装载 + * @param obj json对象,格式:{tousseInstances:[{barcode:'barcode1'},{barcode:'barcode2'},{barcode:'barcode3'}]} + */ function processMultiTousseInstance(obj){ //扫描的是包 if(Ext.getCmp('basketBarcode').getValue() == '') { @@ -1085,8 +1088,10 @@ } }); + var waitSterileLoadingTousseGridSm = new Ext.grid.CheckboxSelectionModel(); //待灭菌装载器械包信息grid的列头,根据可配置的参数进行动态定义 var waitSterileLoadingTousseGridColumnArray = []; + waitSterileLoadingTousseGridColumnArray.push(waitSterileLoadingTousseGridSm); waitSterileLoadingTousseGridColumnArray.push({header: "id", hidden: true, dataIndex: 'id'}); if(sstsConfig.showDepartOfTousseInstanceSterile == true){ waitSterileLoadingTousseGridColumnArray.push({header: "科室", width: 120, sortable: true, dataIndex: 'depart',hidden:!sstsConfig.showDepartOfTousseInstanceSterile}); @@ -1102,7 +1107,9 @@ pageSize:100, displayMsg: '{0}-{1}/{2}', emptyMsg: "没有数据" - }) + }); + + waitSterileLoadingTousseGrid = new Ext.grid.GridPanel({ id : 'waitSterileLoadingTousseGrid', title : '待灭菌装载器械包信息', @@ -1115,8 +1122,9 @@ /*viewConfig: { forceFit:true },*/ - columns: waitSterileLoadingTousseGridColumnArray, - sm : new Ext.grid.RowSelectionModel({singleSelect:true}), + //columns: waitSterileLoadingTousseGridColumnArray, + cm:new Ext.grid.ColumnModel(waitSterileLoadingTousseGridColumnArray), + sm : waitSterileLoadingTousseGridSm, bbar: pageBar, tbar : ['->', { xtype : 'textfield', @@ -1134,6 +1142,22 @@ handler : function (thisButton) { search(); } + },'-', { + text : '载入', + handler : function (thisButton) { + var selectRows = waitSterileLoadingTousseGrid.getSelectionModel().getSelections(); + var selectedBarcodeArray = []; + if(selectRows && selectRows.length && selectRows.length > 0){ + var obj = {}; + for(var i = 0; i < selectRows.length;i++){ + selectedBarcodeArray.push({"barcode" : selectRows[i].data["objBarcode"]}); + } + obj.tousseInstances = selectedBarcodeArray; + processMultiTousseInstance(obj); + }else{ + showResult("请选择需要载入的器械包"); + } + } }, { xtype : 'textfield', hidden : true,