Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
===================================================================
diff -u -r40863 -r41125
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 40863)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 41125)
@@ -126,11 +126,13 @@
 	var tousseDefinitionID = top.Ext4.getCmp('tousseDefinitionID').getValue();
 	var idCardInstanceBarcode = top.Ext4.getCmp('idCardInstanceBarcode').getValue();
 	var instrumentBarcode = top.Ext4.getCmp('instrumentBarcode').getValue();
+	var instrumentSerialNumber = top.Ext4.getCmp('instrumentSerialNumber').getValue();
 	var amount = top.Ext4.getCmp('amount').getValue();
 	var roomNumber = top.Ext4.getCmp('roomNumber').getValue();
 	var washHandNurseName = top.Ext4.getCmp('washHandNurseName').getRawValue();
 	var repairNurseName = top.Ext4.getCmp('repairNurseName').getRawValue();
 	var engineer = top.Ext4.getCmp('engineer').getValue();
+	var engineerPhoneNumber = top.Ext4.getCmp('engineerPhoneNumber').getValue();
 	var repairType = top.Ext4.getCmp('repairType').getValue().value || '';
 	var uniqueTousse = top.Ext4.getCmp('uniqueTousse').getValue().value || '';
 	var repairDateTime = top.Ext4.getCmp('repairDateTime').getRawValue();
@@ -172,7 +174,8 @@
 		tousseDefinitionName: tousseDefinitionName,
 		materialDefinitionName: materialDefinitionName,
 		idCardInstanceBarcode: idCardInstanceBarcode,
-		instrumentBarcode: instrumentBarcode
+		instrumentBarcode: instrumentBarcode,
+		instrumentSerialNumber: instrumentSerialNumber
 	}]
 
 	if (tousseArray.length > 0) {
@@ -185,6 +188,7 @@
 			var tousseDefinitionID = top.Ext4.getCmp('tousseDefinitionID_' + j).getValue();
 			var idCardInstanceBarcode = top.Ext4.getCmp('idCardInstanceBarcode_' + j).getValue();
 			var instrumentBarcode = top.Ext4.getCmp('instrumentBarcode_' + j).getValue();
+			var instrumentSerialNumber = top.Ext4.getCmp('instrumentSerialNumber_' + j).getValue();
 			if (idCardInstanceBarcode == '') {
 				msg = '请扫描标识牌条码！';
 				break;
@@ -201,7 +205,8 @@
 				tousseDefinitionName: tousseDefinitionName,
 				materialDefinitionName: materialDefinitionName,
 				idCardInstanceBarcode: idCardInstanceBarcode,
-				instrumentBarcode: instrumentBarcode
+				instrumentBarcode: instrumentBarcode,
+				instrumentSerialNumber: instrumentSerialNumber
 			})
 		}
 		if (msg !== '') {
@@ -219,6 +224,7 @@
 		washHandNurseName: washHandNurseName,
 		repairNurseName: repairNurseName,
 		engineer: engineer,
+		engineerPhoneNumber: engineerPhoneNumber,
 		repairType: repairType,
 		uniqueTousse: uniqueTousse,
 		repairDateTime: repairDateTime,
@@ -335,6 +341,7 @@
 						top.Ext4.getCmp('instrumentBarcode').setValue(list.instrumentBarcode);
 						top.Ext4.getCmp('hiddenTousseDefinitionName').setValue(list.tousseDefinitionName);
 						top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue(list.materialDefinitionName);
+						top.Ext4.getCmp('instrumentSerialNumber').setValue(list.instrumentSerialNumber);
 						top.Ext4.getCmp('amount').setValue(list.amount);
 					} else {
 						addTousseItems(i);
@@ -346,6 +353,7 @@
 						top.Ext4.getCmp('instrumentBarcode_' + i).setValue(list.instrumentBarcode);
 						top.Ext4.getCmp('hiddenTousseDefinitionName_' + i).setValue(list.tousseDefinitionName);
 						top.Ext4.getCmp('hiddenMaterialDefinitionName_' + i).setValue(list.materialDefinitionName);
+						top.Ext4.getCmp('instrumentSerialNumber_' + i).setValue(list.instrumentSerialNumber);
 						top.Ext4.getCmp('amount_' + i).setValue(list.amount);
 						tousseArray.push(i);
 					}
@@ -354,6 +362,7 @@
 				top.Ext4.getCmp('washHandNurseName').setRawValue(item.washHandNurseName);
 				top.Ext4.getCmp('repairNurseName').setRawValue(item.repairNurseName);
 				top.Ext4.getCmp('engineer').setValue(item.engineer);
+				top.Ext4.getCmp('engineerPhoneNumber').setValue(item.engineerPhoneNumber);
 				top.Ext4.getCmp('repairType').setValue({ value: item.repairType });
 				top.Ext4.getCmp('uniqueTousse').setValue({ value: item.uniqueTousse });
 				top.Ext4.getCmp('repairDateTime').setValue(getTime(item.repairDateTime));
@@ -640,6 +649,18 @@
 				}
 			}
 		}]
+	}, {
+		columnWidth: 0.33,
+		layout: 'form',
+		border: 0,
+		style: 'margin-bottom:10px',
+		items: [{
+			xtype: 'textfield',
+			fieldLabel: '序列号',
+			id: 'instrumentSerialNumber_' + index,
+			name: 'instrumentSerialNumber_' + index,
+			anchor: '95%'
+		}]
 	}]
 	var items = [{
 		columnWidth: 1,
@@ -1025,6 +1046,18 @@
 							}
 						}
 					}]
+				}, {
+					columnWidth: 0.33,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '序列号',
+						id: 'instrumentSerialNumber',
+						name: 'instrumentSerialNumber',
+						anchor: '95%'
+					}]
 				}]
 			}, {
 				columnWidth: 1,
@@ -1106,6 +1139,20 @@
 					anchor: '95%'
 				}]
 			}, {
+				columnWidth: 0.33,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				hidden: engineerIsHidden,
+				items: [{
+					xtype: 'textfield',
+					fieldLabel: '工程师电话',
+					id: 'engineerPhoneNumber',
+					name: 'engineerPhoneNumber',
+					allowBlank: true,
+					anchor: '95%'
+				}]
+			}, {
 				columnWidth: 0.5,
 				layout: 'form',
 				border: 0,