Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js =================================================================== diff -u -r34581 -r34583 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js (.../modifyPatientOfForeignTousseInfoForm.js) (revision 34581) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js (.../modifyPatientOfForeignTousseInfoForm.js) (revision 34583) @@ -670,13 +670,13 @@ //获取待接收外来器械包数据 function getForeignTousseForReceivedData(printType, ids, title) { - // top.Ext.MessageBox.show({ - // title: '请等待', - // msg: '打印中……', - // width: 350, - // progress: false, - // closable: false - // }); + top.Ext.MessageBox.show({ + title: '请等待', + msg: '打印中……', + width: 350, + progress: false, + closable: false + }); var startDate; var endDate; var orgUnitGroupID = ''; @@ -712,8 +712,8 @@ var result = Ext.decode(response.responseText); if (result.success) { if (!ids || ids == '') { - result.startDate = startDate; - result.endDate = endDate; + result.startDate = top.Ext.getCmp('startTime').getRawValue(); + result.endDate = top.Ext.getCmp('endTime').getRawValue(); } if (result.data.length > 0) { if (title == '外来器械处理汇总单') { Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r34581 -r34583 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 34581) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 34583) @@ -4968,14 +4968,14 @@ var label2 = configObj.headerFooter[1].label; var fontSize2 = configObj.headerFooter[1].fontSize; var position2 = configObj.headerFooter[1].position; - var headHtml2 = "
" + label2 + ":" + printObj.startDate + " - " + printObj.endDate + "
"; + var headHtml2 = "" + label2 + ":" + printObj.startDate + " 至 " + printObj.endDate + "
"; LODOP.ADD_PRINT_HTM(position2[0], position2[1], position2[2], position2[3], headHtml2); } } else { var headHtml = "外来器械处理汇总单
"; LODOP.ADD_PRINT_HTM(20, 20, "95%", 50, headHtml); if (printObj.startDate && printObj.endDate) { - var headHtml1 = "接收时间:" + printObj.startDate + " - " + printObj.endDate + "
"; + var headHtml1 = "接收时间:" + printObj.startDate + " 至 " + printObj.endDate + "
"; LODOP.ADD_PRINT_HTM(50, 20, "95%", 50, headHtml1); } } Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js =================================================================== diff -u -r34581 -r34583 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 34581) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 34583) @@ -690,10 +690,10 @@ {header : "序号", dataIndex : '', width : '35', align : 'center'}, {header : "申请时间", dataIndex : 'applicationTime', width : '70', align : 'center'}, {header : "申请科室", dataIndex : 'depart', width : '70', align : 'center'}, - {header : "病人所属科室", dataIndex : 'ascriptionDepartment', width : '70', align : 'center'}, + {header : "病人所属科室", dataIndex : 'ascriptionDepartment', width : '100', align : 'center'}, {header : "住院号", dataIndex : 'hospitalNumber', width : '40', align : 'center'}, {header : "病人姓名", dataIndex : 'patient', width : '50', align : 'center'}, - {header : "手术名称", dataIndex : 'surgery', width : '60', align : 'center'}, + {header : "手术名称", dataIndex : 'surgery', width : '70', align : 'center'}, {header : "供应商", dataIndex : 'supplierName', width : '80', align : 'center'}, {header : "物品名称", dataIndex : 'name', width : '80', align : 'center'}, {header : "灭菌包数量", dataIndex : 'tousseAmount', width : '80', align : 'center'}