Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r18358 -r19982 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 18358) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 19982) @@ -214,6 +214,14 @@ propName: 'remark', displayName: '备注', textForPreview: '缺一把剪刀' + }),new ObjectDataSourceProperty({ + propName: 'materialAmount', + displayName: '器械总数', + textForPreview: '5' + }),new ObjectDataSourceProperty({ + propName: 'totalAmount', + displayName: '材料总数', + textForPreview: '10' })] }); objectDataSourceManager.registerDataSource(normalTousseDataSource); Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r19578 -r19982 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 19578) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 19982) @@ -98,7 +98,9 @@ jsonObj = Ext.decode(result); }); DWREngine.setAsync(true); - + setMaterialsByMaterialObjForPrint(tousseObj,jsonObj); +} +function setMaterialsByMaterialObjForPrint(tousseObj,jsonObj){ var materials = []; for(var i = 0; i < jsonObj.result.length;++i){ if(jsonObj.result[i].typeName != "一次性物品"){ @@ -110,7 +112,8 @@ } } tousseObj.materials = materials; - + tousseObj.materialAmount = jsonObj.materialAmount; + tousseObj.totalAmount = jsonObj.totalAmount; } // 设置灭菌程序简称 function setSterilisationAbbreviationForPrint(tousseObj,barcode){ @@ -275,6 +278,7 @@ jsonObj = Ext.decode(result); }); DWREngine.setAsync(true); + setMaterialsByMaterialObjForPrint(tousseObj,jsonObj); var pageType = jsonObj.barcodePaperType; if(isUndefinedOrNullOrEmpty(pageType)){ pageType = tousseObj.pageType;