Index: ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventReportView.jsp =================================================================== diff -u -r32919 -r32963 --- ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventReportView.jsp (.../adverseEventReportView.jsp) (revision 32919) +++ ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventReportView.jsp (.../adverseEventReportView.jsp) (revision 32963) @@ -3,7 +3,9 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <% - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat dateStartFormat = new SimpleDateFormat("yyyy/MM/01"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); + request.setAttribute("start", dateStartFormat.format(new Date())); request.setAttribute("today", dateFormat.format(new Date())); %> @@ -16,6 +18,7 @@
Index: ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventView.jsp =================================================================== diff -u -r32919 -r32963 --- ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventView.jsp (.../adverseEventView.jsp) (revision 32919) +++ ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventView.jsp (.../adverseEventView.jsp) (revision 32963) @@ -3,7 +3,9 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <% - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat dateStartFormat = new SimpleDateFormat("yyyy/MM/01"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); + request.setAttribute("start", dateStartFormat.format(new Date())); request.setAttribute("today", dateFormat.format(new Date())); %> @@ -16,6 +18,7 @@ Index: ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventView.js =================================================================== diff -u -r32919 -r32963 --- ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventView.js (.../adverseEventView.js) (revision 32919) +++ ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventView.js (.../adverseEventView.js) (revision 32963) @@ -3,16 +3,17 @@ Ext4.onReady(function () { Ext4.QuickTips.init(); - var startDate = today + " 00:00:00"; + var startDate = start + " 00:00:00"; var endDate = today + " 23:59:59"; var form = getFormView('list'); var columns = [ { header: "事件名称", dataIndex: 'eventName', width: 150, sortable: false }, - { header: "事件发生事件", dataIndex: 'eventTime', width: 150, sortable: false }, + { header: "事件发生时间", dataIndex: 'eventTime', width: 150, sortable: false }, { header: "申请单号", dataIndex: 'invoicePlanSerialNumber', width: 150, sortable: false }, - { header: "超时处理方式", dataIndex: 'timeoutHandType', width: 150, sortable: false }, - { header: "备注", dataIndex: 'remark', width: document.body.clientWidth - 630, sortable: false } + { header: "超时处理方式", dataIndex: 'timeoutHandType', id: 'timeoutHandType', width: 150, sortable: false }, + { header: "科室", dataIndex: 'depart', id: 'depart', width: 100, sortable: false }, + { header: "备注", dataIndex: 'remark', width: document.body.clientWidth - 730, sortable: false } ]; listStore = new Ext4.data.JsonStore({ @@ -36,6 +37,7 @@ { name: 'id' }, { name: 'eventName' }, { name: 'invoicePlanSerialNumber' }, + { name: 'depart' }, { name: 'eventCode' }, { name: 'timeoutHandType' }, { name: 'eventTime' }, Index: ssts-web/src/main/webapp/disinfectsystem/adverseEvent/searchForm.js =================================================================== diff -u -r32919 -r32963 --- ssts-web/src/main/webapp/disinfectsystem/adverseEvent/searchForm.js (.../searchForm.js) (revision 32919) +++ ssts-web/src/main/webapp/disinfectsystem/adverseEvent/searchForm.js (.../searchForm.js) (revision 32963) @@ -1,5 +1,5 @@ function getFormView(view) { - var startDate = today + " 00:00:00"; + var startDate = start + " 00:00:00"; var endDate = today + " 23:59:59"; //事件名称 var adverseEventStore = new Ext4.data.Store({ @@ -81,6 +81,13 @@ listStore.proxy.extraParams.startTime = startDate; listStore.proxy.extraParams.endTime = endDate; listStore.proxy.extraParams.eventCode = eventCode; + if (eventCode == 1) { + Ext4.getCmp('timeoutHandType').show(); + Ext4.getCmp('depart').hide(); + } else { + Ext4.getCmp('timeoutHandType').hide(); + Ext4.getCmp('depart').show(); + } listStore.loadPage(1); } else { reloadReport();