Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
===================================================================
diff -u -r32609 -r37274
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp (.../toussePictures.jsp) (revision 32609)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp (.../toussePictures.jsp) (revision 37274)
@@ -38,11 +38,14 @@
request.setAttribute("projectName", projectName);
%>
- <%@ include file="/common/include_Ext42_Css.jsp"%>
+
<%@ include file="/common/includeExtJsAndCss.jsp"%>
-<%@ include file="/common/include_Ext42_Js.jsp"%>
+<%@ include file="/common/include_Ext425JsAndCss.jsp"%>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
@@ -63,6 +66,8 @@
}
+
+
@@ -72,6 +77,7 @@
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js
===================================================================
diff -u -r32606 -r37274
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js (.../toussePictures.js) (revision 32606)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js (.../toussePictures.js) (revision 37274)
@@ -1,7 +1,7 @@
var form = null;
var myMask;
-var tousseDefinitionIDQuery;
-var toussepackingNameQuery;
+var tousseDefinitionIDQuery = '';
+var toussepackingNameQuery = '';
function reloadReport(){
if (!form.getForm().isValid()) {
showResult('请正确填写表单各值');
@@ -28,6 +28,10 @@
showResult('器械包名称不能为空!' , null , sstsConfig.messagePauseTimeOnPackingPage);
return;
}
+
+ tousseDefinitionIDQuery = tousseDefinitionID;
+ toussepackingNameQuery = tousseName;
+
var url = WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&tousseDefinitionID=" + tousseDefinitionID +
"&tousseName=" + tousseName + "&parentPageName=toussePictures&number=1&showToussePictures=true";
@@ -128,6 +132,18 @@
return;
}
}
+ },{
+ xtype : 'button',
+ text : '打印器械包明细单',
+ minWidth : 70,
+ iconCls : 'icon_print',
+ handler : function() {
+ if(tousseDefinitionIDQuery == '' || toussepackingNameQuery == ''){
+ showResult('请先扫描条码或者输入包名称进行查询！');
+ return;
+ }
+ printTousseDefinitionMaterial(tousseDefinitionIDQuery,false,null,0,'tousseView');
+ }
}],
items : [{
layout : 'column',