Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r16947 -r16951
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 16947)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 16951)
@@ -562,13 +562,18 @@
SSTS_InterfereForeigntousseApplication_ViewMenu = false;
+var SSTS_InterfereTerminateInvoicePlan_ViewMenu = true;
+
+SSTS_InterfereTerminateInvoicePlan_ViewMenu = false;
+
+
//重名科室干预
var SSTS_InterfereOrgUnit_ViewMenu = true;
SSTS_InterfereOrgUnit_ViewMenu = false;
//干预管理模块
-var SSTS_InterfereManagerView = SSTS_InterfereSterilizationRecord_ViewMenu && SSTS_InterfereRecyclingApplication_ViewMenu && SSTS_InterfereForeigntousseApplication_ViewMenu && SSTS_InterfereOrgUnit_ViewMenu;
+var SSTS_InterfereManagerView = SSTS_InterfereSterilizationRecord_ViewMenu && SSTS_InterfereRecyclingApplication_ViewMenu && SSTS_InterfereForeigntousseApplication_ViewMenu && SSTS_InterfereOrgUnit_ViewMenu && SSTS_InterfereTerminateInvoicePlan_ViewMenu;
var SSTS_ReturnGoodsRecord_Menu = true;
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereTerminateInvoicePlanView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereTerminateInvoicePlanView.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereTerminateInvoicePlanView.js (revision 16951)
@@ -0,0 +1,151 @@
+Ext.onReady(function() {
+
+ var goodsTypeStore = new Ext.data.SimpleStore( {
+ fields : ['typeId','typeName'],
+ data : [ [1,'器械包'],[2,'一次性物品'],[3,'全部物品']]
+ });
+
+ var supplyRoomStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
+ method : 'POST'
+ }),
+ baseParams :{type:"12"},
+ reader : new Ext.data.JsonReader({
+ fields : [
+ {name : 'id'},
+ {name : 'departId'},
+ {name : 'name'}
+
+ ]
+ })
+ });
+ supplyRoomStore.load();
+
+ var dt = new Date();
+ var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/1";
+
+ var form = new Ext.Panel({
+ title : '批量终止申请单',
+ layout : 'table',
+ frame : true,
+ width: 600,
+ border : false,
+ bodyBorder : false,
+ buttonAlign:"center",
+ layout : 'column',
+ items:[{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 100,
+ items : [{
+ xtype : 'datefieldWithMin',
+ fieldLabel : '开始日期',
+ id : 'startDate',
+ name : 'startDate',
+ readOnly : true,
+ format : 'Y-m-d',
+ allowBlank : false,
+ anchor : '95%',
+ value: new Date(startDayofMonth)
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 100,
+ items : [{
+ xtype : 'datefieldWithMin',
+ fieldLabel : '结束日期',
+ id : 'endDate',
+ name : 'endDate',
+ readOnly : true,
+ format : 'Y-m-d',
+ allowBlank : false,
+ anchor : '95%',
+ value: new Date()
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 100,
+ items : [{
+ xtype : 'combo',
+ fieldLabel : "终止物品类型",
+ displayField : 'typeName',
+ valueField : 'typeId',
+ store : goodsTypeStore,
+ forceSelection : true,
+ editable : false,
+ mode : 'local',
+ triggerAction : 'all',
+ name : "type",
+ id : "type",
+ anchor : '95%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 100,
+ labelSeparator : '处理科室',
+ items : [{
+ xtype : 'combo',
+ id : 'handleDepart',
+ name : 'handleDepart',
+ valueField : 'departId',
+ displayField : 'name',
+ allowBlank : true,
+ editable : false,
+ store : supplyRoomStore,
+ forceSelection : true,
+ triggerAction : 'all',
+ anchor : '95%'
+ }]
+ }],
+ buttons:[{
+ text:'终止',
+ handler : function() {
+ var startDate = Ext.getCmp("startDate").getRawValue();
+ var endDate = Ext.getCmp("endDate").getRawValue();
+ var type = Ext.getCmp("type").getValue();
+ var handleDepartCoding = Ext.getCmp("handleDepart").getValue();
+ if(startDate == "" || endDate == ""){
+ showResult("开始日期、结束日期不能为空!");
+ return false;
+ }
+ if(type == ""){
+ showResult("终止物品类型不能为空！");
+ return false;
+ }
+
+ top.Ext.MessageBox.confirm("请确认","终止申请单后数据无法恢复，是否要继续？",
+ function(button, text) {
+ if ("yes" == button) {
+ var myMask = new Ext.LoadMask(Ext.getBody(),{msg:"正在处理中..."});
+ myMask.show();
+ Ext.Ajax.request( {
+ url : WWWROOT + '/disinfectSystem/baseData/maintainAction!terminateTousseItems.do',
+ params : {
+ from : startDate,
+ to : endDate,
+ type : type,
+ handleDepartCoding : handleDepartCoding
+ },
+ success : function(response, options) {
+ myMask.hide();
+ var result = response.responseText;
+ showResult(result);
+ },
+ failure : function(response, options) {
+ myMask.hide();
+ showResult("系统加载失败，请稍候再试");
+ }
+ });
+ }
+ }
+ );
+ }
+ }]
+ });
+ Ext.getCmp("type").setValue(1);
+ form.render("formDiv");
+});
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r16947 -r16951
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 16947)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 16951)
@@ -243,6 +243,7 @@
+
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r16947 -r16951
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 16947)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 16951)
@@ -393,7 +393,8 @@
{hidden :SSTS_InterfereSterilizationRecord_ViewMenu,text:"代理灭菌单干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereProxyDisinfectionView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_InterfereRecyclingApplication_ViewMenu,text:"申请单干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereGoodsApplicationView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_InterfereForeigntousseApplication_ViewMenu,text:"外来器械干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_InterfereOrgUnit_ViewMenu,text:"重名科室干预管理",href:WWWROOT+'/disinfectsystem/interfere/processSameOrgunitName/processSameOrgunitNameData.mhtml',hrefTarget:linkTarget,leaf:true}
+ {hidden :SSTS_InterfereOrgUnit_ViewMenu,text:"重名科室干预管理",href:WWWROOT+'/disinfectsystem/interfere/processSameOrgunitName/processSameOrgunitNameData.mhtml',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_InterfereTerminateInvoicePlan_ViewMenu,text:"批量终止申请单管理",href:WWWROOT+'/disinfectsystem/interfere/interfereTerminateInvoicePlanView.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
text:"消毒供应中心物品领用",
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereTerminateInvoicePlanView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereTerminateInvoicePlanView.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereTerminateInvoicePlanView.jsp (revision 16951)
@@ -0,0 +1,28 @@
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+批量终止申请单
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
===================================================================
diff -u -r16052 -r16951
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java (.../MaintainAction.java) (revision 16052)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java (.../MaintainAction.java) (revision 16951)
@@ -30,6 +30,7 @@
import com.forgon.disinfectsystem.packing.service.PackingManager;
import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
import com.forgon.tools.hibernate.ObjectDao;
import edu.emory.mathcs.backport.java.util.Collections;
@@ -150,6 +151,7 @@
String fromDate = StrutsParamUtils.getPraramValue("from", null);
String toDate = StrutsParamUtils.getPraramValue("to", null);
String type = StrutsParamUtils.getPraramValue("type", null);
+ String handleDepartCoding = StrutsParamUtils.getPraramValue("handleDepartCoding", null);
String responsePrintMsg = "更新完成！";
@@ -180,6 +182,10 @@
+ "between " + dateQueryAdapter.dateAdapter(fromDate)
+ "and " + dateQueryAdapter.dateAdapter(toDate);
+ if(StringUtils.isNotBlank(handleDepartCoding)){
+ sql += " and po.invoicePlan.handleDepartCoding = '" + handleDepartCoding + "'";
+ }
+
sql += " and (po.isTerminated is null or po.isTerminated != 1)" +
" and po.invoicePlan.deliverStatus IN (:deliverStatus)";
@@ -223,14 +229,8 @@
}else{
responsePrintMsg = "请输入开始日期、结束日期以及物品类型！";
}
- try {
- HttpServletResponse response = StrutsParamUtils.getResponse();
- response.setContentType("text/html;charset=UTF-8");
- response.getWriter().print(responsePrintMsg);
- response.getWriter().close();
- } catch (IOException e) {
- e.printStackTrace();
- }
+
+ StrutsResponseUtils.output(responsePrintMsg);
}
// 按时间段删除申请单及该时间段内的清洗、使用记录、质量监测等记录