Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp
===================================================================
diff -u -r14888 -r17503
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp (.../departmentMonthlyDetailDSInvoiceItemView.jsp) (revision 14888)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp (.../departmentMonthlyDetailDSInvoiceItemView.jsp) (revision 17503)
@@ -18,6 +18,8 @@
var orgUnitName = '${orgUnitName}';
var orgUnitCoding = '${orgUnitCoding}';
var supplyRoomType = '${supplyRoomType}';
+ var startTime = '<%= request.getParameter("startTime")%>';
+ var endTime = '<%= request.getParameter("endTime")%>';
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17493 -r17503
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17493)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17503)
@@ -6451,8 +6451,8 @@
List datas = new ArrayList();
List allTousseType = getTousseTypes(typeSearch);
- startTime += " 00:00:00";
- endTime += " 23:59:59";
+ startTime += ":00";
+ endTime += ":59";
// String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
String monthFilterSql = " ";
String returnGoodsFilterSql = " ";
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r17478 -r17503
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 17478)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 17503)
@@ -2077,6 +2077,19 @@
handler : function() {
deliverySummary();
}
+ },{
+ text : '查看明细核算月报',
+ hidden : !sstsConfig.enableRedirectInvoiceItemView,
+ iconCls : 'btn_ext_application_go',
+ handler : function() {
+ var dt = new Date();
+ var startTime = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/" + (dt.getDate() - 1) + " 17:30";
+ var endTime = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/" + dt.getDate() + " 17:30";
+ window.open(WWWROOT+"/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp" +
+ "?startTime=" + startTime +
+ "&endTime=" + endTime,
+ '_self');
+ }
}
/*, {
text : '修改时间',
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r17020 -r17503
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 17020)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 17503)
@@ -110,10 +110,11 @@
{name : 'amount',mapping : 'amount'}]
)
});
-
- var dt = new Date();
- var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
-
+ if ((!startTime || startTime == 'null') && (!endTime || endTime == 'null')) {
+ var dt = new Date();
+ startTime = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01 00:00";
+ endTime = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/" + dt.getDate() + " 23:59";
+ }
var form = new Ext.form.FormPanel({
title : '明细核算月报',
region : 'north',
@@ -143,11 +144,11 @@
id : 'startTime',
name : 'startTime',
editable : false,
- format : 'Y-m-d',
+ format : 'Y-m-d H:i',
altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
allowBlank : false,
anchor : '95%',
- value: new Date(startDayofMonth),
+ value: new Date(startTime),
listeners : {
specialkey : function(field, e) {
if (e.getKey() == Ext.EventObject.ENTER) {
@@ -172,11 +173,11 @@
id : 'endTime',
name : 'endTime',
editable : false,
- format : 'Y-m-d',
+ format : 'Y-m-d H:i',
altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
allowBlank : false,
anchor : '95%',
- value: new Date(),
+ value: new Date(endTime),
listeners : {
specialkey : function(field, e) {
if (e.getKey() == Ext.EventObject.ENTER) {
@@ -410,4 +411,5 @@
//departSearch.disable();
}
+ reloadReport()
});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
===================================================================
diff -u -r17478 -r17503
--- ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 17478)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 17503)
@@ -51,5 +51,7 @@
//在pda中是否选择灭菌炉分组进入对应分组的灭菌列表
selectSterilizerGroupInPDA : true,
//启用发货汇总单查看功能
- enableDeliverySummaryView : true
+ enableDeliverySummaryView : true,
+ //是否启用从发货管理页面跳转到明细核算月报的功能
+ enableRedirectInvoiceItemView : true
}
\ No newline at end of file