Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
===================================================================
diff -u -r32057 -r33199
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 32057)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 33199)
@@ -39,6 +39,12 @@
+
+
+<%@ include file="/disinfectsystem/print/print.jsp"%>
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js
===================================================================
diff -u -r32163 -r33199
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 32163)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 33199)
@@ -704,7 +704,7 @@
}]
}],
buttons : [{
- text : "重新装配",
+ text : "重新装配并打印标签",
handler : function() {
if (!splitforeignPanel.form.isValid()) {
@@ -812,6 +812,18 @@
if(!sstsConfig.showCameraPhoto){
showResult(result.message);
}
+ var printAmount = result.tousses[0].printAmount;
+ for (var pi = 0; pi < printAmount; ++pi) {// 支持多份打印
+ for (var i = 0; i < result.tousses.length; i++) {
+ var tousseObj = result.tousses[i];
+ tousseObj.taskId = tousseItemId;
+ // 必须先调用此代码,然后才能调用Ext.MessageBox.updateProgress
+ top.Ext4.MessageBox.progress('打印中', '请稍候...');
+ top.Ext4.MessageBox.updateProgress((pi * result.tousses.length + i + 1) / (printAmount * result.tousses.length), '第' + (pi + 1) + '次打印,共' + printAmount + '次,第' + (i + 1) + '个包,共' + result.tousses.length + '个包');
+ doPrintLabel(tousseObj);
+ }
+ }
+ hideMessageBox4(true);
window.close();
}else{
showResult(result.message);