Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r37905 -r37924
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 37905)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 37924)
@@ -613,13 +613,15 @@
var dataIndex = item.dataIndex;
var align = item.align;
var height = item.height;
+ var value = printObj[dataIndex] || '';
+ var nextValue = printObj[nextItem.dataIndex] || '';
if (dataIndex !== '') {
- tableHtml += "
" + itemHeader + ":" + printObj[dataIndex] + " | ";
+ tableHtml += "" + itemHeader + ":" + value + " | ";
} else {
tableHtml += "" + itemHeader + " | ";
}
if (dataIndex !== '') {
- tableHtml += "" + nextItem.header + ":" + printObj[nextItem.dataIndex] + " | ";
+ tableHtml += "" + nextItem.header + ":" + nextValue + " | ";
} else {
tableHtml += "" + nextItem.header + " | ";
}
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r37922 -r37924
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 37922)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 37924)
@@ -848,8 +848,8 @@
var result = Ext.decode(response.responseText);
if (result.success) {
if (result.data.length > 0) {
- LODOP.PRINT_INIT("");
doGetLodop();
+ LODOP.PRINT_INIT("");
var myObj = printConfig['printBiologyInfo'];
if (isUndefinedOrNullOrEmpty(myObj)) {
var msg = '未找到(printBiologyInfo)的打印配置';
@@ -873,7 +873,7 @@
}
LODOP.PRINT();
} else {
- showMultipleResult('只能选择灭菌完成且进行了生物监测的灭菌记录进行打印。', null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
+ showMultipleResult('没有符合打印条件的器械包,请检查后重新操作。', null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
return;
}
} else {