Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js =================================================================== diff -u -r14051 -r15062 --- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js (.../config.js) (revision 14051) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js (.../config.js) (revision 15062) @@ -32,7 +32,10 @@ showAppliedGoodsBeforeSubmit : true, // 隐藏使用记录的洗手护士域 hideWashHandNurseOfUseRecord : true, + //使用记录的洗手护士是否允许空 useRecordWashHandNurseAllowBlank : true, + //使用记录的手术间是否允许空 + useRecordOperationRoomAllowBlank : false, // 隐藏使用记录的诊疗号域 hideTreatmentNumOfUseRecord : false, // 使用记录审核方式, 1: 审核和转换按钮分开; 2:审核和转换按钮合并为1个 Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js =================================================================== diff -u -r13765 -r15062 --- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js (.../printConfig.js) (revision 13765) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js (.../printConfig.js) (revision 15062) @@ -166,7 +166,7 @@ // 在器械包和一次性物品不合并打印的情况下,消毒物品打印方式: // 1:优先与一次性物品合并打印,如果无一次性物品则与器械包合并打印, 2:优先与器械包一起合并打印,如果没有器械包则与一次性物品合并打印 ,3:单独打印 disinfectGoodsPrintMode : 2, - rowsPerPage : 8, + rowsPerPage : 99, headerContent : [ // 标题 {label : "无菌物品领用单 ", dataIndex : 'header', fontSize : 17, position : ["0","60mm","99%",22]}, @@ -1007,14 +1007,14 @@ setFontSizeBold(fontSize,1);// 设置字体 setAlignment('center');// 对齐 - LODOP.ADD_PRINT_TEXT("6mm","1mm","34mm","6mm", "灭菌:"+obj.sterilizationDate); - setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("6mm","30mm","30mm","6mm", "装配:"+obj.operator); - setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("12mm","1mm","34mm","6mm", "失效:"+obj.validDate); - setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("12mm","30mm","30mm","6mm", "审核:"+obj.reviewer); - setFontSizeBold(10,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("6mm","7mm","34mm","6mm", "灭菌:"+obj.sterilizationDate); + setFontSizeBold(9,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("6mm","32mm","30mm","1mm", "装配:"+obj.operator); + setFontSizeBold(8,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("12mm","7mm","34mm","6mm", "失效:"+obj.validDate); + setFontSizeBold(9,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("12mm","32mm","30mm","1mm", "审核:"+obj.reviewer); + setFontSizeBold(8,0);// 设置字体 LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1 }