Index: ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.js
===================================================================
diff -u -r14631 -r16206
--- ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.js	(.../printInvoiceConfigView.js)	(revision 14631)
+++ ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.js	(.../printInvoiceConfigView.js)	(revision 16206)
@@ -35,7 +35,7 @@
 	var columns = [
 	       	    {header : "标识号",dataIndex : 'id',hidden :true},
 	       	    {header : "班次",dataIndex : 'shift',width : 150, renderer : modifyRecord},
-	       	    {header : "同科室的多张发货单合并打印",dataIndex : 'mergePrint',width : 170},
+	       	    {header : "发货单合并方式",dataIndex : 'mergePrintType',width : 170},
 	       	    {id : 'departNames',header : "科室名称",dataIndex : 'departNames'},
 	       	    {header : "排序操作",dataIndex : 'orderNum', renderer : moveUpDown, sortable: false, menuDisabled: true},
 	       	    {header : "科室代码",dataIndex : 'departCodes',hidden : true}
@@ -48,7 +48,7 @@
 	var readerDetail = [
 	    {name : 'id'}, 
 	    {name : 'shift'},
-	    {name : 'mergePrint'},
+	    {name : 'mergePrintType'},
 	    {name : 'mergePrintTousseDisposable'},
 	    {name : 'printOrder'},
 	    {name : 'disinfectGoodsPrintMode'},