Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r21047 -r21305 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 21047) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 21305) @@ -139,6 +139,8 @@ {name : 'applicantDepart'}, {name : 'isUrgentTousse'}, {name : 'includedTousseAmount'}, + {name : 'reduceDescription'}, + {name : 'damageDescription'}, {name : 'haveUnSupplementMaterials'} ] }), @@ -473,6 +475,8 @@ tousseObj.isTraceable = records[i].data['isTraceable']; tousseObj.printCause = '历史装配记录重新打印'; tousseObj.logPrintTousse = true; + + top.Ext4.applyIf(tousseObj,records[i].data); // 外部代理灭菌单上的器械包的打印 if('外部代理灭菌' == tousseObj.tousseType){ var hospitalName = ""; @@ -497,7 +501,7 @@ } else{ - top.Ext4.applyIf(tousseObj,records[i].data); + //先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整) tousseObj.tousseNameWithoutDepart = tousseObj.tousseName; var haveUnSupplementMaterials = records[i].data['haveUnSupplementMaterials']; Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r21222 -r21305 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 21222) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 21305) @@ -226,6 +226,14 @@ propName: 'includedTousseAmount', displayName: '聚合包总个数', textForPreview: '10' + }),new ObjectDataSourceProperty({ + propName: 'reduceDescription', + displayName: '丢失材料描述', + textForPreview: '剪刀x1' + }),new ObjectDataSourceProperty({ + propName: 'damageDescription', + displayName: '报损材料描述', + textForPreview: '镊子x1' })] }); objectDataSourceManager.registerDataSource(normalTousseDataSource);