Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r17239 -r17263 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 17239) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 17263) @@ -93,7 +93,7 @@ {hidden :SSTS_Invoice_Create,text:"科室发货计划设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Invoice_Select,text:"发货单管理",href:WWWROOT+'/disinfectsystem/invoice/invoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Invoice_Select,text:"材料发货管理",href:WWWROOT+'/disinfectsystem/invoice/materialInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Invoice_Select,text:"手术预约管理",href:WWWROOT+'/disinfectsystem/invoice/operationReservationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_OR_Menu,text:"手术预约管理",href:WWWROOT+'/disinfectsystem/invoice/operationReservationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :true,text:"发货单批量打印",href:WWWROOT+'/disinfectsystem/invoice/invoicePrintView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DeliverGoodsQuqery_Menu,text:"发货物品查询",href:WWWROOT+'/disinfectsystem/reportforms/invoiceQueryView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true} ] Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java =================================================================== diff -u -r17132 -r17263 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java (.../OperationReservationAction.java) (revision 17132) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java (.../OperationReservationAction.java) (revision 17263) @@ -189,6 +189,22 @@ StrutsResponseUtils.output(array); } + /** + * 批量提交手术预约单 + */ + public void batchSubmitOperationReservation(){ + String ids = StrutsParamUtils.getPraramValue("ids", ""); + boolean success = true; + String message = "修改成功！"; + try { + operationReservationManager.batchSubmitOperationReservation(ids); + } catch (Exception e) { + success = false; + message = e.getMessage(); + } + StrutsResponseUtils.output(success, message);; + } + @Override public void prepare() throws Exception { Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r17195 -r17263 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 17195) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 17263) @@ -536,7 +536,7 @@ var SSTS_Invoice_Menu = true; - + SSTS_Invoice_Menu = false; @@ -550,6 +550,11 @@ SSTS_Invoice_Select = false; +var SSTS_OR_Menu = true; + +SSTS_OR_Menu = false; + + var SSTS_DeliverGoodsQuqery_Menu = true; SSTS_DeliverGoodsQuqery_Menu = false; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java =================================================================== diff -u -r15487 -r17263 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java (.../OperationReservationManager.java) (revision 15487) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java (.../OperationReservationManager.java) (revision 17263) @@ -27,4 +27,10 @@ * @return */ public JSONObject toJson(OperationReservation operationReservation); + + /** + * 批量提交手术预约单 + * @param ids + */ + public void batchSubmitOperationReservation(String ids); } Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r17187 -r17263 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 17187) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 17263) @@ -109,8 +109,18 @@ + + + + + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js =================================================================== diff -u -r17157 -r17263 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 17157) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 17263) @@ -77,7 +77,7 @@ items : jsonArray }; - var operationReservationWindow = top.Ext.getCmp("materialInvoiceWin"); + var operationReservationWindow = top.Ext.getCmp("operationReservationWin"); form.form.submit({ url : WWWROOT + '/disinfectsystem/operationReservationAction!saveOperationReservation.do', method : 'POST', @@ -633,7 +633,7 @@ }); operationReservationWindow = new top.Ext.Window( { - id : 'materialInvoiceWin', + id : 'operationReservationWin', layout : 'fit', title : '手术预约单信息', width : 700, @@ -693,13 +693,12 @@ showResult("请选择要删除的单据！"); return false; } - var ids = null; + var ids = ""; for ( var i = 0, len = records.length; i < len; i++) { - if (ids == null) { - ids = records[i].data['id']; - } else { - ids = ids + ';' + records[i].data['id']; + if (ids != "") { + ids += ";"; } + ids += records[i].data['id']; } top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的手术预约单信息？", function(button, text) { @@ -719,7 +718,46 @@ } } ); +} +/** + * 批量提交手术预约单 + */ +function batchSubmintOperationReservation(grid) { + var records = grid.getSelectionModel().getSelections(); + if (records.length == 0) { + showResult("请选择要提交的单据！"); + return false; + } + var ids = ""; + for ( var i = 0, len = records.length; i < len; i++) { + var committedStatus = records[i].data['committedStatus']; + if(committedStatus){ + continue; + } + if (ids != "") { + ids += ";"; + } + ids += records[i].data['id']; + } + top.Ext.MessageBox.confirm("请确认","是否确定要提交选中的手术预约单信息？", + function(button, text) { + if ("yes" == button){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectsystem/operationReservationAction!batchSubmitOperationReservation.do', + params : {ids : ids}, + success : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message); + grid.dwrReload(); + }, + failure : function(response, options) { + showResult(response.responseText); + } + }); + } + } + ); } function editRecord(id,committedStatus){ @@ -821,24 +859,31 @@ var sign = true; var tbar = [{ text : '添加', - hidden : SSTS_Invoice_Update, + hidden : SSTS_OR_Create, iconCls : 'btn_ext_application_add', handler : function() { editOperationReservation("",0); } - }, { + },'-', { text : '删除', - hidden : SSTS_Invoice_Delete, + hidden : SSTS_OR_Delete, iconCls : 'btn_ext_application_del', handler : function() { deleteOperationReservation(grid); } - }, { + },'-', { text : '刷新列表', iconCls : 'btn_ext_refresh1', handler : function() { grid.dwrReload(); } + },'-', { + text : '提交', + hidden : SSTS_OR_Create, + iconCls : 'btn_ext_cog_go', + handler : function() { + batchSubmintOperationReservation(grid); + } }]; grid = new Ext.ux.ForgonPageGrid( { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java =================================================================== diff -u -r17132 -r17263 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 17132) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 17263) @@ -11,6 +11,7 @@ import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; @@ -61,6 +62,15 @@ public void setTousseItemManager(TousseItemManager tousseItemManager) { this.tousseItemManager = tousseItemManager; } + + private OperationReservation getById(String id) { + if (StringUtils.isNotBlank(id)) { + return (OperationReservation) objectDao.getByProperty( + OperationReservation.class.getSimpleName(), "id", + Long.valueOf(id)); + } + return null; + } @Override public void saveOrUpdate(String json) { @@ -249,4 +259,22 @@ return json; } + @Override + public void batchSubmitOperationReservation(String ids) { + if(StringUtils.isBlank(ids)){ + throw new RuntimeException("没有需要提交的单据！"); + } + String [] idArray = ids.split(";"); + for (String id : idArray) { + OperationReservation or = getById(id); + if(or == null){ + throw new RuntimeException("id="+id+"的单据已不存在！"); + } + if(or.getCommittedStatus() == null || !or.getCommittedStatus()){ + or.setCommittedStatus(true); + objectDao.saveOrUpdate(or); + } + } + } + } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp =================================================================== diff -u -r17132 -r17263 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp (.../operationReservationView.jsp) (revision 17132) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp (.../operationReservationView.jsp) (revision 17263) @@ -43,19 +43,16 @@