Index: ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js
===================================================================
diff -u -r39474 -r39652
--- ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js (.../config.js) (revision 39474)
+++ ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js (.../config.js) (revision 39652)
@@ -27,6 +27,8 @@
reviewPageReviewerDefaultLastReviewer : true,
// 是否支持部分终止申请单中的物品
enableTerminatePartOfApplication : true,
+ //打印发货单版本多选模式
+ multiSelectModeOfPrintInvoiceVersion:true,
//安卓上,录入灭菌及查看灭菌记录界面,单独添加的器械包组默认展开
expandAddTousseGroupInAndroidSterileView : true,
//限制入库单填写的一次性物品为能申领的物品
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp
===================================================================
diff -u -r29513 -r39652
--- ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp (.../selectInvoiceConfig.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp (.../selectInvoiceConfig.jsp) (revision 39652)
@@ -27,20 +27,20 @@
var text = $(this).text();
var win = parent.Ext.getCmp('extWindow');
- win.returnValue = id+""+text;
+ win.returnValue = id;
win.close();
});
});
-
-
+
+
<%
if(list.size()>0){
for(PrintInvoiceConfig pc : list){
%>
-
<%=pc.getShift()%>
+
<%=pc.getShift()%>
<%
}
}
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfigForCheckbox.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfigForCheckbox.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfigForCheckbox.jsp (revision 39652)
@@ -0,0 +1,57 @@
+<%@page import="java.util.List"%>
+<%@page import="com.forgon.disinfectsystem.entity.printinvoiceconfig.PrintInvoiceConfig"%>
+<%@page import="com.forgon.disinfectsystem.printinvoiceconfig.service.PrintInvoiceConfigManager"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+
+<%
+PrintInvoiceConfigManager printInvoiceConfigManager = (PrintInvoiceConfigManager) SpringBeanManger.getBean("printInvoiceConfigManager");
+List
list = printInvoiceConfigManager.getAll();
+%>
+
+<%@ include file="/common/clearCache.jsp"%>
+选择打印分组
+
+
+
+
+
+
+
+
+
+ <%
+ if(list.size()>0){
+ for(PrintInvoiceConfig pc : list){
+ %>
+
<%=pc.getShift()%>
+ <%
+ }
+ }
+ %>
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
===================================================================
diff -u -r38245 -r39652
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js (.../invoicePrintModule.js) (revision 38245)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js (.../invoicePrintModule.js) (revision 39652)
@@ -26,8 +26,13 @@
function showSelectUser(){//没看到这个方法有被调用过
var params = {}
- var url = WWWROOT+"/disinfectsystem/invoice/selectInvoiceConfig.jsp";
- return openModalWindowForExt(url,params, "选择打印分组");
+ if(sstsConfig.multiSelectModeOfPrintInvoiceVersion){
+ var url = WWWROOT+"/disinfectsystem/invoice/selectInvoiceConfigForCheckbox.jsp";
+ return openModalWindowForExt(url,params, "选择打印分组",940,600);
+ }else {
+ var url = WWWROOT+"/disinfectsystem/invoice/selectInvoiceConfig.jsp";
+ return openModalWindowForExt(url,params, "选择打印分组",940,600);
+ }
}
var mask = null;
function getMask(){
@@ -120,6 +125,41 @@
});
DWREngine.setAsync(true);
}
+ this.mergeLoadPrintDataByConfig = function(arr,index){
+ var thiz = this;
+ var id = arr[index].split('@')[0];
+ var name = arr[index].split('@')[1];
+ Ext.Ajax.request({
+ url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintDataByConfig.do',
+ params : {id : id,isMergeRemark:isMergeRemark},
+ success : function(response){
+ var result = Ext.decode(response.responseText);
+ if(!result.success){
+ if(result.message){
+ showResult(result.message);
+ }
+ }else{
+ if(result.batches.length <= 0){
+ showResult(name + "没有打印数据");
+ }else{
+ for(var i = 0; i < result.batches.length;++i){
+ thiz.batchPrintInvoices_result(result.batches[i], 0);
+ }
+ refresh();
+ }
+ }
+ if(index == arr.length - 1){
+ mask.hide();
+ }else {
+ thiz.mergeLoadPrintDataByConfig(arr,index+1)
+ }
+ },
+ failure: function(response){
+ showResult("打印失败!");
+ mask.hide();
+ }
+ });
+ }
this.batchPrint = function(){
var selectResult = showSelectUser();
if(selectResult == null && selectResult == undefined){
@@ -134,44 +174,57 @@
return '';
}
- var id = returnValue.split("")[0];
- if(id == '' || id == null){
- showResult('请选择对应的班次!');
- return;
- }
- var mask = new Ext.LoadMask(Ext.getBody(), {
- msg : '正在处理批量打印请求,请稍候...'
- });
- mask.show();
-
- Ext.Ajax.request({
- url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintDataByConfig.do',
- params : {id : id,isMergeRemark:isMergeRemark},
- success : function(response){
- var result = Ext.decode(response.responseText);
- mask.hide();
- if(!result.success){
- if(result.message){
- showResult(result.message);
- }
- }else{
- if(result.batches.length <= 0){
- showResult("没有打印数据");
+ if(sstsConfig.multiSelectModeOfPrintInvoiceVersion){
+ var value = returnValue;
+ if(value == '' || value == null){
+ showResult('请选择对应的班次!');
+ return;
+ }
+ var mask = new Ext.LoadMask(Ext.getBody(), {
+ msg : '正在处理批量打印请求,请稍候...'
+ });
+ mask.show();
+
+ thiz.mergeLoadPrintDataByConfig(value.split(';'), 0);
+ }else {
+ var id = returnValue;
+ if(id == '' || id == null){
+ showResult('请选择对应的班次!');
+ return;
+ }
+ var mask = new Ext.LoadMask(Ext.getBody(), {
+ msg : '正在处理批量打印请求,请稍候...'
+ });
+ mask.show();
+ Ext.Ajax.request({
+ url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintDataByConfig.do',
+ params : {id : id,isMergeRemark:isMergeRemark},
+ success : function(response){
+ var result = Ext.decode(response.responseText);
+ mask.hide();
+ if(!result.success){
+ if(result.message){
+ showResult(result.message);
+ }
}else{
- for(var i = 0; i < result.batches.length;++i){
- thiz.batchPrintInvoices_result(result.batches[i], 0);
+ if(result.batches.length <= 0){
+ showResult("没有打印数据");
+ }else{
+ for(var i = 0; i < result.batches.length;++i){
+ thiz.batchPrintInvoices_result(result.batches[i], 0);
+ }
+ refresh();
}
- refresh();
+
+ //updatePrintStatus(ids);
}
-
- //updatePrintStatus(ids);
+ },
+ failure: function(response){
+ showResult("打印失败!");
+ mask.hide();
}
- },
- failure: function(response){
- showResult("打印失败!");
- mask.hide();
- }
- });
+ });
+ }
}
},500);
}