Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm2.js
===================================================================
diff -u -r36000 -r41075
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm2.js	(.../instrumentRepairManagementForm2.js)	(revision 36000)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm2.js	(.../instrumentRepairManagementForm2.js)	(revision 41075)
@@ -57,6 +57,10 @@
 	var receiveNurseID = top.Ext4.getCmp('receiveNurseID').getValue();
 	var receiveNurseName = top.Ext4.getCmp('receiveNurseName').getValue();
 	var repairInfoRemind = top.Ext4.getCmp('repairInfoRemind').getValue();
+	var repairSupplier = top.Ext4.getCmp('repairSupplier').getValue();
+	var supplierContactName = top.Ext4.getCmp('supplierContactName').getValue();
+	var phoneNumber = top.Ext4.getCmp('phoneNumber').getValue();
+	var repairPrice = top.Ext4.getCmp('repairPrice').getValue();
 
 	var tousseMaterialInfo = [{
 		amount: amount,
@@ -106,7 +110,11 @@
 		handoverNurseName: handoverNurseName,
 		receiveNurseID: receiveNurseID,
 		receiveNurseName: receiveNurseName,
-		repairInfoRemind: repairInfoRemind
+		repairInfoRemind: repairInfoRemind,
+		repairSupplier: repairSupplier,
+		supplierContactName: supplierContactName,
+		phoneNumber: phoneNumber,
+		repairPrice: repairPrice
 	}
 	top.Ext4.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/baseData/instrumentRepairAction!saveInstrumentRepair.do',
@@ -251,6 +259,10 @@
 				top.Ext4.getCmp('receiveNurseName').setValue(item.receiveNurseName);
 				top.Ext4.getCmp('repairInfoRemind').setValue(item.repairInfoRemind);
 				top.Ext4.getCmp('discardDateTime').setValue(getTime(item.discardDateTime));
+				top.Ext4.getCmp('repairSupplier').setValue(item.repairSupplier);
+				top.Ext4.getCmp('supplierContactName').setValue(item.supplierContactName);
+				top.Ext4.getCmp('phoneNumber').setValue(item.phoneNumber);
+				top.Ext4.getCmp('repairPrice').setValue(item.repairPrice);
 			} else {
 				showResult('系统加载出错，请稍候再试');
 			}
@@ -1123,6 +1135,63 @@
 						triggerAction: 'all',
 						anchor: '95%'
 					}]
+				}, {
+					columnWidth: 0.33,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '维修厂家名称',
+						id: 'repairSupplier',
+						name: 'repairSupplier',
+						allowBlank: false,
+						maxLength:200,
+						anchor: '95%'
+					}]
+				}, {
+					columnWidth: 0.33,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '厂家联系人',
+						id: 'supplierContactName',
+						name: 'supplierContactName',
+						allowBlank: false,
+						maxLength:200,
+						anchor: '95%'
+					}]
+				}, {
+					columnWidth: 0.33,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '联系电话',
+						id: 'phoneNumber',
+						name: 'phoneNumber',
+						allowBlank: false,
+						maxLength:200,
+						anchor: '95%'
+					}]
+				}, {
+					columnWidth: 0.33,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
+						xtype: 'numberfield',
+						fieldLabel: '维修价格(元)',
+						id: 'repairPrice',
+						name: 'repairPrice',
+						allowBlank: false,
+						allowDecimals: true,
+						minValue: 0,
+						anchor: '95%'
+					}]
 				}]
 			}]
 		}],
@@ -1148,7 +1217,7 @@
 		layout: 'border',
 		title: '器械维修记录',
 		width: 1000,
-		height: 600,
+		height: 650,
 		border: false,
 		plain: true,
 		modal: true,