Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
===================================================================
diff -u -r35411 -r36788
--- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 35411)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 36788)
@@ -49,6 +49,14 @@
 		amountElement.setText(text);
 	}
 }
+
+//GYKQ-81：保存并打印
+function printInvoiceAfterInvoice(invoiceIds){
+	if(!isUndefinedOrNull(invoiceIds)){
+		var invoicePrintModule = new InvoicePrintModule(grid,$Id('userName').value);
+		invoicePrintModule.batchPrintInvoiceWithType(invoiceIds.join(","),'全部');
+	}
+}
 /**
  * 发货单窗口
  * @param orgUnitCoding 科室编码
@@ -220,7 +228,7 @@
 		},
 		dataIndex:'button'
 	}]);
-	function doSaveAction(){
+	function doSaveAction(printInvoiceCallback){
 		if (!form.getForm().isValid()) {
 			showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
 			return false;
@@ -246,6 +254,9 @@
 				// 一定要事务提交成功才返回发货计划列表界面
 				showResult(action.result.message , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
 				if(action.result.success){
+					if (printInvoiceCallback != null) {
+						printInvoiceCallback(action.result.invoiceIds);
+					}
 					auxiliaryInvoiceFormWindow.close();
 					grid.getStore().reload();
 				}
@@ -758,6 +769,11 @@
 					]
 				}],
 				buttons : [{
+					text : '保存并打印',
+					id:'saveAndPrintButton',
+					hidden: !sstsConfig.enableSaveAndPrintWhenInvoice,
+					handler : function(){doSaveAction(printInvoiceAfterInvoice);}
+				}, {
 					text : '保存',
 					id:'saveButton',
 					handler : function(){doSaveAction();}