Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r33667 -r34121
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 33667)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 34121)
@@ -4880,8 +4880,10 @@
var position = configObj.headerFooter[0].position;
var headHtml = "
" + label + "
";
LODOP.ADD_PRINT_HTM(position[0], position[1], position[2], position[3], headHtml);
- var headHtml1 = "" + printObj.startDate + " - " + printObj.endDate + "
";
- LODOP.ADD_PRINT_HTM(50, 20, "95%", 50, headHtml1);
+ if(printObj.startDate && printObj.endDate){
+ var headHtml1 = "" + printObj.startDate + " - " + printObj.endDate + "
";
+ LODOP.ADD_PRINT_HTM(50, 20, "95%", 50, headHtml1);
+ }
}
if (!isObjEmpty(configObj.goodsTable)) {
var tableHtml = "";
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
===================================================================
diff -u -r33732 -r34121
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js (.../config.js) (revision 33732)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js (.../config.js) (revision 34121)
@@ -233,8 +233,8 @@
generateProxySterilizationFormFunctionInHistoricalAssemblyRecords:true,
//装配管理页面查看回收人
showRecyclingPeopleColumnInPackingTasksList:true,
- //启用打印待接收外来器械包功能
- enableTheFunctionOfPrintingOfForeignTousseToBeReceived:true,
+ //启用打印处理外来器械统计表功能
+ enableTheFunctionOfPrintProcessingOfForeignToussed:true,
//是否统计一次性物品发放数量(消毒供应中心年度工作量统计报表)
statisticDisposableGoodsSendAmount:true,
//是否显示一次性物品发货数量(在消毒供应中心员工工作量统计报表,加强版叫做消毒供应中心员工绩效评分表)
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r33523 -r34121
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 33523)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 34121)
@@ -494,13 +494,35 @@
modifyPatientInfo(records[0].data.id);
}
}, '-', {
+ type: 'button',
text : '打印处理外来器械统计表',
iconCls : 'icon_print',
id : 'printTbar',
- hidden : !sstsConfig.enableTheFunctionOfPrintingOfForeignTousseToBeReceived,
- handler : function() {
- openPrintForeignTousseWindow();
- }
+ hidden : !sstsConfig.enableTheFunctionOfPrintProcessingOfForeignToussed,
+ menu: new Ext.menu.Menu({
+ items: [
+ {
+ text:'打印指定时间段内的所有申请单',
+ handler: function(){
+ openPrintForeignTousseWindow();
+ }},
+ {
+ text:'打印选中的申请单',
+ handler:function(){
+ var records = grid.getSelectionModel().getSelections();
+ if (records.length == 0) {
+ showResult("请先选中需要打印的申请单!");
+ return false;
+ }
+ var idsArr = [];
+ for(var i=0;i 0) {
printForeignTousseForReceived(result, printType)
} else {