Index: ssts-web/src/main/webapp/disinfectsystem/print/print.jsp =================================================================== diff -u -r26815 -r27681 --- ssts-web/src/main/webapp/disinfectsystem/print/print.jsp (.../print.jsp) (revision 26815) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.jsp (.../print.jsp) (revision 27681) @@ -20,6 +20,7 @@ request.setAttribute("allTemplateInfoJsonStr",allTemplateInfoJsonStr); request.setAttribute("allTemplateList",allTemplateList); %> + Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r27679 -r27681 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 27679) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 27681) @@ -1141,14 +1141,14 @@ }); function print_container(barcode,name,unitName,printType) { var obj = { - barcode:barcode, - name:name, - unitName:'', - defaultPrintFun: function(){ - defaultPrint(barcode,name,''); - }, - dataSourceName: '篮筐', - styleName: '默认' + barcode:barcode, + name:name, + unitName:'', + defaultPrintFun: function(){ + defaultPrint(barcode,name,''); + }, + dataSourceName: '生物监测包', + styleName: '1' } printObjWithdefaultPrintFun(obj); }; Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r26815 -r27681 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 26815) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 27681) @@ -52,7 +52,7 @@ this.tableDataSources[tableDataSource.name] = tableDataSource; }, getDataSourceNamesForCombo: function(){ - var s = []; + var s = []; for(var p in this.tableDataSources){ if(this.tableDataSources.hasOwnProperty(p)){ var o = [this.tableDataSources[p].name]; @@ -120,7 +120,7 @@ this.dataSources[dataSource.name] = dataSource; }, getDataSourceNamesForCombo: function(){ - var s = []; + var s = []; for(var p in this.dataSources){ if(this.dataSources.hasOwnProperty(p)){ var o = [this.dataSources[p].name]; @@ -742,7 +742,24 @@ textForPreview: '1号仓库' })] }); -objectDataSourceManager.registerDataSource(storageLocationDataSource); +//生物监测包 +var biologicalMonitoringDataSource = new ObjectDataSource({ + name: '生物监测包', + objectProperties: [new ObjectDataSourceProperty({ + propName: 'barcode', + displayName: '条码', + textForPreview: '010000110' + }),new ObjectDataSourceProperty({ + propName: 'name', + displayName: '名称', + textForPreview: '生物监测包' + }),new ObjectDataSourceProperty({ + propName: 'unitName', + displayName: '单位名称', + textForPreview: '中山一院' + })] +}); +objectDataSourceManager.registerDataSource(biologicalMonitoringDataSource); //开启库位管理,才显示库位编码、库位简称 if(sstsConfig.enableWarehousePositionModule){ var storageLocationCodeObj = new ObjectDataSourceProperty({