Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r15909 -r16096
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 15909)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 16096)
@@ -1759,7 +1759,7 @@
 	    {header : "责任人",width : 70,dataIndex : 'personInCharge'},
 	    {header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute},
 	    {header : "状态",width : 70,dataIndex : 'status',renderer : renderColor},
-	    {header : "类型",width : 110,dataIndex : 'invoicePlan.type',sortable:false},
+	    {header : "类型",width : 110,dataIndex : 'invoicePlanType',sortable:false},
 	    {id : 'remark',header : "备注",width : 110,dataIndex : 'remark'},
 	    {header : "打印时间",width : 120,dataIndex : 'printTime',sortable:false,renderer : myDateFormatByMinute},
 	    {header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor},
@@ -1789,7 +1789,7 @@
 	    {name : 'totalPrice'},
 	    {name : 'remark'},
 	    {name : 'hospitalNumber'},
-	    {name : 'invoicePlan.type'},
+	    {name : 'invoicePlanType'},
 	    {name : 'receiptor'},
 	    {name : 'receiptingTime'},
 	    {name : 'personInCharge'},
@@ -1807,7 +1807,7 @@
 		    {type : 'list',dataIndex : 'status',options : [ invoiceStatusNo, invoiceStatusYes,invoiceStatusSigned ],phpMode : true},
 		    {type : 'date',dataIndex : 'sendTime'},
 		    {type : 'date',dataIndex : 'applicationTime'},
-		    {type : 'string',dataIndex : 'invoicePlan.type'},
+		    {type : 'string',dataIndex : 'invoicePlanType'},
 		    {type : 'numeric',dataIndex : 'totalPrice'},
 		    {type : 'string',dataIndex : 'hospitalNumber'},
 		    {type : 'string',dataIndex : 'remark'}