Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r37396 -r37406 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 37396) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 37406) @@ -3768,36 +3768,44 @@ } hideMessageBox(false); } else { - top.Ext.Msg.show({ - title: '输入打印份数', - msg: '打印份数:', - width: 100, - buttons: Ext.MessageBox.OKCANCEL, - prompt: true, - fn: function (bu, txt) { - if (bu == 'ok') { - if (isNaN(txt) == false) { - Ext.MessageBox.progress('打印中', '请稍候...'); - var curNumber = 0; - var count = Number(txt) * tousses.length; - for (var j = 0; j < Number(txt); j++) { - for (var i = 0; i < tousses.length; i++) { - var toussedef = tousses[i]; - toussedef.currentDateTime = currentDateTime; - ++curNumber; - Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个'); - printTousseDefinitionMaterialsInTousseView(toussedef, isPrint); + if(pageSoure == 'toussePictures'){ + for (var i = 0; i < tousses.length; i++) { + var toussedef = tousses[i]; + toussedef.currentDateTime = currentDateTime; + printTousseDefinitionMaterialsInTousseView(toussedef, isPrint); + } + }else { + top.Ext.Msg.show({ + title: '输入打印份数', + msg: '打印份数:', + width: 100, + buttons: Ext.MessageBox.OKCANCEL, + prompt: true, + fn: function (bu, txt) { + if (bu == 'ok') { + if (isNaN(txt) == false) { + Ext.MessageBox.progress('打印中', '请稍候...'); + var curNumber = 0; + var count = Number(txt) * tousses.length; + for (var j = 0; j < Number(txt); j++) { + for (var i = 0; i < tousses.length; i++) { + var toussedef = tousses[i]; + toussedef.currentDateTime = currentDateTime; + ++curNumber; + Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个'); + printTousseDefinitionMaterialsInTousseView(toussedef, isPrint); + } } + hideMessageBox(false); + } else { + showResult("打印份数必须是数字,请重新输入!"); } - hideMessageBox(false); - } else { - showResult("打印份数必须是数字,请重新输入!"); } - } - }, - animEl: 'addAddressBtn', - value: '1' - }); + }, + animEl: 'addAddressBtn', + value: '1' + }); + } } } }