Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r17126 -r17200
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 17126)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 17200)
@@ -51,7 +51,9 @@
 	}
 	var departCoding = records[0].data['departCoding'];
 	var depart = records[0].data['depart'];
-	addAndEditInvoicePlan(departCoding,depart,id);
+	//提交状态,true表示已提交,false表示未提交
+	var committedStatus = records[0].data['committedStatus'];
+	addAndEditInvoicePlan(departCoding,depart,id,committedStatus);
 }
 
 function modify(v,data){
@@ -82,6 +84,7 @@
   	     {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},*/
          {id:'remark',header: "备注", dataIndex: 'remark'}
   	];
 
@@ -97,6 +100,7 @@
 	    {name : 'scheduleId'},
 	    {name : 'consoleName'},
 	    {name : 'deliverStatus'},
+	    {name : 'committedStatus'},
 	    {name : 'remark'}
 	];
 	
@@ -847,9 +851,14 @@
  * 发货单窗口
  * @param orgUnitCoding 科室编码
  * @param depart 科室名称
+ * @param selectedInvoicePlanId 所选申请单的id
+ * @param committedStatus 提交状态(true表示已提交,false未提交)
  */
-function addAndEditInvoicePlan(orgUnitCoding,depart,selectedInvoicePlanId) {
-//	alert(orgUnitCoding+','+depart+','+selectedInvoicePlanId)
+function addAndEditInvoicePlan(orgUnitCoding,depart,selectedInvoicePlanId,committedStatus) {
+	//判断提交状态,true表示已提交,false表示未提交
+	if(!committedStatus){
+		alert("该手术预约单还未提交,不能发货只能查看!");
+	}
 	selectedApplyDate = '';
 	selectedTousseType = '';
 	lastLoadWarehouseId = null;
@@ -1465,6 +1474,7 @@
 				}],
 				buttons : [{
 					text : '保存',
+					disabled : committedStatus ? false : true,//未提交则保存按钮置灰
 					id:'saveButton',
 					handler : function() {
 						if (!form.getForm().isValid()) {