Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r17200 -r17213
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 17200)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 17213)
@@ -63,7 +63,22 @@
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	
-	function renderColor(v, p, record){
+	//提交状态
+	function renderCommittedStatusColor(v, p, record){
+		var status = record.data['committedStatus'];
+		var color = "";
+		if(!status){//未提交 黄色
+			color = "yellow";
+			v = "未提交";
+		}else{ //已提交 白色
+			color = "#FFFFFF";
+			v = "已提交";
+		}
+		return "<p style=\"background-color:"+color+"\">" + v + "</p>";
+	}
+	
+	//发货状态
+	function renderDeliverStatusColor(v, p, record){
 		var status = record.data['deliverStatus'];
 		var color = "";
 		if("待发货" == status){//待发货 黄色
@@ -83,8 +98,8 @@
   	     {header : "手术时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute},
   	     {header : "手术编号",width : 120,dataIndex : 'scheduleId', renderer : myDateFormatByMinute},
 	     {header : "手术台次",width : 120,dataIndex : 'consoleName', renderer : myDateFormatByMinute},
-  	     {header : "发货状态",width : 65,dataIndex : 'deliverStatus', renderer : renderColor},
-  	     /*{header : "提交状态",width : 65,dataIndex : 'committedStatus', hidden : true},*/
+	     {header : "提交状态",width : 65,dataIndex : 'committedStatus', renderer : renderCommittedStatusColor},
+  	     {header : "发货状态",width : 65,dataIndex : 'deliverStatus', renderer : renderDeliverStatusColor},
          {id:'remark',header: "备注", dataIndex: 'remark'}
   	];