Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r18491 -r25150
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 18491)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 25150)
@@ -53,7 +53,7 @@
 	var depart = records[0].data['depart'];
 	//提交状态,true表示已提交,false表示未提交
 	var committedStatus = records[0].data['committedStatus'];
-	addAndEditInvoicePlan(departCoding,depart,id,committedStatus);
+	addAndEditInvoicePlan(departCoding,depart,id,committedStatus,records[0].data);
 }
 
 function modify(v,data){
@@ -97,8 +97,8 @@
   	     {header : "医生",width : 120,dataIndex : 'doctors'},
   	     {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 : 'committedStatus', renderer : renderCommittedStatusColor},
+				 {header : "手术台次",width : 120,dataIndex : 'consoleName', renderer : myDateFormatByMinute},
+				 {header : "提交状态",width : 65,dataIndex : 'committedStatus', renderer : renderCommittedStatusColor},
   	     {header : "发货状态",width : 65,dataIndex : 'deliverStatus', renderer : renderDeliverStatusColor},
          {id:'remark',header: "备注", dataIndex: 'remark'}
   	];
@@ -112,8 +112,13 @@
 	    {name : 'applicant'},
 	    {name : 'applicationTime'}, 
 	    {name : 'doctors'},
+	    {name : 'doctors'},
 	    {name : 'scheduleId'},
+	    {name : 'patientName'},
+	    {name : 'operationName'},
+	    {name : 'operatingRoom'},
 	    {name : 'consoleName'},
+	    {name : 'consoleName'},
 	    {name : 'deliverStatus'},
 	    {name : 'committedStatus'},
 	    {name : 'remark'}
@@ -870,7 +875,7 @@
  * @param selectedInvoicePlanId 所选申请单的id
  * @param committedStatus 提交状态(true表示已提交,false未提交)
  */
-function addAndEditInvoicePlan(orgUnitCoding,depart,selectedInvoicePlanId,committedStatus) {
+function addAndEditInvoicePlan(orgUnitCoding,depart,selectedInvoicePlanId,committedStatus,operationReservation) {
 	//判断提交状态,true表示已提交,false表示未提交
 	if(!committedStatus){
 		alert("该手术预约单还未提交,不能发货只能查看!");
@@ -1135,12 +1140,83 @@
 						value:$Id('userName').value,
 						cls:'fieldReadOnlyNoRemove'
 					}]
-				},{
+				},
+				
+				
+				{
 					layout : 'form',
 					labelWidth :70,
 					columnWidth :.33,
 					items : [{
 						xtype : 'textfield',
+						fieldLabel : '病人姓名',
+						maxLength : '100',
+						id : 'patientName',
+						name : 'patientName',
+						value : operationReservation.patientName,
+						readOnly:true,
+						anchor : '99%',
+						cls:'fieldReadOnlyNoRemove'
+						
+					}]
+				},
+				{
+					layout : 'form',
+					labelWidth :70,
+					columnWidth :.33,
+					items : [{
+						xtype : 'textfield',
+						fieldLabel : '手术间',
+						maxLength : '100',
+						id : 'operatingRoom',
+						name : 'operatingRoom',
+						value : operationReservation.operatingRoom,
+						readOnly:true,
+						anchor : '99%',
+						cls:'fieldReadOnlyNoRemove'
+						
+					}]
+				},
+				{
+					layout : 'form',
+					labelWidth :90,
+					columnWidth :.33,
+					items : [{
+						xtype : 'textfield',
+						fieldLabel : '手术台次',
+						maxLength : '100',
+						id : 'consoleName',
+						name : 'consoleName',
+						value : operationReservation.consoleName,
+						readOnly:true,
+						anchor : '99%',
+						cls:'fieldReadOnlyNoRemove'
+						
+					}]
+				},
+				{
+					layout : 'form',
+					columnWidth : 1,
+					labelWidth :70,
+					items : [{
+						xtype : 'textarea',
+						fieldLabel : '手术名称',
+						id : 'operationName',
+						name : 'operationName',
+						value : operationReservation.operationName,
+						anchor : '98.5%',
+						height : 40,
+						readOnly:true
+					}]
+				},
+				
+				
+				{
+					layout : 'form',
+					labelWidth :70,
+					columnWidth :.33,
+					items : [{
+						xtype : 'textfield',
 						fieldLabel : '核对员条码',
 						maxLength : '16',
 						id : 'senderBarcode',