Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
===================================================================
diff -u -r41125 -r41145
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 41125)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 41145)
@@ -159,14 +159,16 @@
 			}
 		}
 	}
-	if (idCardInstanceBarcode == '') {
-		showResult('请扫描标识牌条码！')
-		return
+	if (sstsConfig.enableInstrumentLifeCycleTraceabilityManagement) {
+		if (idCardInstanceBarcode == '') {
+			showResult('请扫描标识牌条码！')
+			return
+		}
+		if (instrumentBarcode == '') {
+			showResult('请扫描器械条码！')
+			return
+		}
 	}
-	if (instrumentBarcode == '') {
-		showResult('请扫描器械条码！')
-		return
-	}
 	var tousseMaterialInfo = [{
 		amount: amount,
 		materialDefinitionID: materialDefinitionID,
@@ -189,14 +191,16 @@
 			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;
+			if (sstsConfig.enableInstrumentLifeCycleTraceabilityManagement) {
+				if (idCardInstanceBarcode == '') {
+					msg = '请扫描标识牌条码！';
+					break;
+				}
+				if (instrumentBarcode == '') {
+					msg = '请扫描器械条码！';
+					break;
+				}
 			}
-			if (instrumentBarcode == '') {
-				msg = '请扫描器械条码！';
-				break;
-			}
 			var amount = top.Ext4.getCmp('amount_' + j).getValue();
 			tousseMaterialInfo.push({
 				amount: amount,
@@ -459,6 +463,10 @@
 
 //添加器械包块
 function addTousseItems(index) {
+	var hiddenBarcode = true;
+	if (sstsConfig.enableInstrumentLifeCycleTraceabilityManagement) {
+		hiddenBarcode = false;
+	}
 	var item = [{
 		columnWidth: 0.29,
 		layout: 'form',
@@ -494,7 +502,7 @@
 			forceSelection: false,
 			triggerAction: 'all',
 			hideTrigger: true,
-			disabled: true,
+			disabled: !hiddenBarcode,
 			typeAhead: false,
 			allowBlank: false,
 			anchor: '95%',
@@ -544,7 +552,7 @@
 		layout: 'form',
 		border: 0,
 		style: 'margin-bottom:10px',
-		hidden: sstsConfig.disableIdCard,
+		hidden: hiddenBarcode,
 		items: [{
 			xtype: 'textfield',
 			id: 'scanIdCardBarcode_' + index,
@@ -568,24 +576,26 @@
 		layout: 'form',
 		border: 0,
 		style: 'margin-bottom:10px',
+		hidden: hiddenBarcode,
 		items: [{
 			xtype: 'numberfield',
 			allowDecimals: false,
 			minValue: 1,
-			name: 'amount_' + index,
-			id: 'amount_' + index,
+			name: hiddenBarcode ? 'amount1_' + index : 'amount_' + index,
+			id: hiddenBarcode ? 'amount1_' + index : 'amount_' + index,
 			fieldLabel: "数量",
 			allowBlank: false,
 			blankText: '数量不能为空',
 			anchor: '95%',
-			disabled: true,
+			disabled: !hiddenBarcode,
 			value: 1
 		}]
 	}, {
 		columnWidth: 0.33,
 		layout: 'form',
 		border: 0,
 		style: 'margin-bottom:10px',
+		hidden: hiddenBarcode,
 		items: [{
 			xtype: 'textfield',
 			fieldLabel: '器械条码',
@@ -630,7 +640,7 @@
 			triggerAction: 'all',
 			hideTrigger: true,
 			typeAhead: false,
-			disabled: true,
+			disabled: !hiddenBarcode,
 			allowBlank: false,
 			anchor: '60%',
 			listeners: {
@@ -654,7 +664,26 @@
 		layout: 'form',
 		border: 0,
 		style: 'margin-bottom:10px',
+		hidden: !hiddenBarcode,
 		items: [{
+			xtype: 'numberfield',
+			allowDecimals: false,
+			minValue: 1,
+			name: hiddenBarcode ? 'amount_' + index : 'amount1_' + index,
+			id: hiddenBarcode ? 'amount_' + index : 'amount1_' + index,
+			fieldLabel: "数量",
+			allowBlank: false,
+			blankText: '数量不能为空',
+			anchor: '95%',
+			disabled: !hiddenBarcode,
+			value: 1
+		}]
+	}, {
+		columnWidth: 0.33,
+		layout: 'form',
+		border: 0,
+		style: 'margin-bottom:10px',
+		items: [{
 			xtype: 'textfield',
 			fieldLabel: '序列号',
 			id: 'instrumentSerialNumber_' + index,
@@ -760,6 +789,10 @@
 		dateXtype = 'datefield';
 		dateEditable = true;
 	}
+	var hiddenBarcode = true;
+	if (sstsConfig.enableInstrumentLifeCycleTraceabilityManagement) {
+		hiddenBarcode = false;
+	}
 	formPanel = new top.Ext4.form.Panel({
 		id: 'configForm',
 		frame: true,
@@ -884,7 +917,7 @@
 						displayField: 'name',
 						store: tousseDefinitionStore,
 						lazyInit: true,
-						disabled: true,
+						disabled: !hiddenBarcode,
 						triggerAction: 'all',
 						hideTrigger: true,
 						typeAhead: false,
@@ -940,7 +973,7 @@
 					layout: 'form',
 					border: 0,
 					style: 'margin-bottom:10px',
-					hidden: sstsConfig.disableIdCard,
+					hidden: hiddenBarcode,
 					items: [{
 						xtype: 'textfield',
 						id: 'scanIdCardBarcode',
@@ -964,15 +997,16 @@
 					layout: 'form',
 					border: 0,
 					style: 'margin-bottom:10px',
+					hidden: hiddenBarcode,
 					items: [{
 						xtype: 'numberfield',
 						allowDecimals: false,
 						minValue: 1,
-						name: 'amount',
-						id: 'amount',
+						name: hiddenBarcode ? 'amount1' : 'amount',
+						id: hiddenBarcode ? 'amount1' : 'amount',
 						fieldLabel: "数量",
 						allowBlank: false,
-						disabled: true,
+						disabled: !hiddenBarcode,
 						blankText: '数量不能为空',
 						anchor: '95%',
 						value: 1
@@ -982,6 +1016,7 @@
 					layout: 'form',
 					border: 0,
 					style: 'margin-bottom:10px',
+					hidden: hiddenBarcode,
 					items: [{
 						xtype: 'textfield',
 						fieldLabel: '器械条码',
@@ -1025,7 +1060,7 @@
 						lazyInit: true,
 						triggerAction: 'all',
 						hideTrigger: true,
-						disabled: true,
+						disabled: !hiddenBarcode,
 						typeAhead: false,
 						allowBlank: false,
 						anchor: '60%',
@@ -1051,7 +1086,26 @@
 					layout: 'form',
 					border: 0,
 					style: 'margin-bottom:10px',
+					hidden: !hiddenBarcode,
 					items: [{
+						xtype: 'numberfield',
+						allowDecimals: false,
+						minValue: 1,
+						name: hiddenBarcode ? 'amount' : 'amount1',
+						id: hiddenBarcode ? 'amount' : 'amount1',
+						fieldLabel: "数量",
+						allowBlank: false,
+						disabled: !hiddenBarcode,
+						blankText: '数量不能为空',
+						anchor: '95%',
+						value: 1
+					}]
+				}, {
+					columnWidth: 0.33,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
 						xtype: 'textfield',
 						fieldLabel: '序列号',
 						id: 'instrumentSerialNumber',