Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
===================================================================
diff -u -r41119 -r41172
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js	(.../routineMonitoringForm.js)	(revision 41119)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js	(.../routineMonitoringForm.js)	(revision 41172)
@@ -1,3 +1,4 @@
+var formPanel;
 var qmInstanceStore = new Ext.data.Store({
 	proxy: new Ext.data.MemoryProxy([]),
 	reader: new Ext.data.JsonReader({
@@ -193,12 +194,14 @@
 	if ('是' == isTriggerItem && (value == null || value == "")) {
 		hideElement = true;
 	}
+	var actualWidth = document.body.clientWidth;
+	var columnWidth = actualWidth > 500 ? 0.5 : 1;
 	if (type == '文本') {
 		if ((value == null || value == "") && !doNotSetDefaultValue) {
 			value = options;
 		}
 		return {
-			columnWidth: .5,
+			columnWidth: columnWidth,
 			layout: 'form',
 			labelWidth: 90,
 			hidden: hideElement,
@@ -219,7 +222,7 @@
 			value = options;
 		}
 		return {
-			columnWidth: .9,
+			columnWidth: columnWidth,
 			layout: 'form',
 			labelWidth: 90,
 			hidden: hideElement,
@@ -238,7 +241,7 @@
 
 	} else if (type == '数字') {
 		return {
-			columnWidth: .5,
+			columnWidth: columnWidth,
 			layout: 'form',
 			labelWidth: 90,
 			hidden: hideElement,
@@ -256,7 +259,7 @@
 		};
 	} else if (type == '时间') {
 		return {
-			columnWidth: .5,
+			columnWidth: columnWidth,
 			layout: 'form',
 			labelWidth: 90,
 			hidden: hideElement,
@@ -279,7 +282,7 @@
 			value = '00:00';
 		}
 		return {
-			columnWidth: .5,
+			columnWidth: columnWidth,
 			layout: 'form',
 			labelWidth: 90,
 			hidden: hideElement,
@@ -299,7 +302,7 @@
 		};
 	} else if (type == '日期') {
 		return {
-			columnWidth: .5,
+			columnWidth: columnWidth,
 			layout: 'form',
 			labelWidth: 90,
 			hidden: hideElement,
@@ -333,7 +336,7 @@
 			}
 		}
 		return {
-			columnWidth: .5,
+			columnWidth: columnWidth,
 			layout: 'form',
 			labelWidth: 90,
 			style: 'margin-top:10px',
@@ -403,8 +406,8 @@
 				}
 				optionsArray.push({
 					layout: 'form',
-					columnWidth: 0.5,
-					labelWidth: 200,
+					columnWidth: .5,
+					labelWidth: actualWidth > 500 ? 200 : 150,
 					style: 'margin-top:10px',
 					items: [{
 						name: 'cconfigItemOption' + id,
@@ -467,6 +470,8 @@
 		qualifiedChecked = false;
 		unqualifiedChecked = true;
 	}
+	var actualWidth = document.body.clientWidth;
+	var labelWidth = actualWidth > 500 ? 200 : 150;
 	Ext.getCmp('addRoutineMonitoringForm').add({
 		id: 'resultFieldSet',
 		xtype: "fieldset",
@@ -482,7 +487,7 @@
 			items: [{
 				layout: 'form',
 				columnWidth: 0.5,
-				labelWidth: 200,
+				labelWidth: labelWidth,
 				items: [{
 					name: 'result',
 					fieldLabel: '合格',
@@ -494,7 +499,7 @@
 			}, {
 				layout: 'form',
 				columnWidth: 0.5,
-				labelWidth: 200,
+				labelWidth: labelWidth,
 				items: [{
 					name: 'result',
 					fieldLabel: '不合格',
@@ -889,12 +894,10 @@
 	});
 
 }
-
-/**
- * 添加或者修改定期监测实例.
- * @param id
- */
-function addRoutineMonitoring(id, sterilerConfirmObj) {
+var sterilerConfirmObj = {};
+var formDefinitionStore;
+//BJDXZLYY-69：表单跟内容拆分，先渲染再加载数据
+function getFormPanelContent(id) {
 	var materialDefinitionStore = new Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
 			url: WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionData.do',
@@ -915,7 +918,6 @@
 			}
 		}
 	});
-
 	var tousseDefinitionStore = new Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
 			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do?type=' + encodeURI('器械包和外来器械包'),
@@ -932,8 +934,7 @@
 			{ name: 'amount', mapping: 'amount' }]
 		)
 	});
-
-	var formDefinitionStore = new Ext.data.Store({
+	formDefinitionStore = new Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
 			url: WWWROOT + '/disinfectSystem/qualityMonitoringDefinitionAction!loadLastDeployFormDefinitionGroupByFormName.do',
 			method: 'POST'
@@ -970,8 +971,9 @@
 
 	var actualWidth = document.body.clientWidth;
 	var actualHeight = document.body.clientHeight;
+	var columnWidth = actualWidth > 500 ? 0.5 : 1;
 
-	var formPanel = new Ext.FormPanel({
+	formPanel = new Ext.FormPanel({
 		id: 'addRoutineMonitoringForm',
 		frame: true,
 		labelSeparator: '：',
@@ -1051,7 +1053,7 @@
 				id: 'isRepacking'
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'combo',
@@ -1085,7 +1087,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'datefieldWithMin',
@@ -1167,7 +1169,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'textfield',
@@ -1186,7 +1188,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'combo',
@@ -1222,7 +1224,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'combo',
@@ -1248,7 +1250,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'numberfield',
@@ -1260,7 +1262,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'textfield',
@@ -1273,7 +1275,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				hidden: sstsConfig.disableThePeriodicMonitoringRecordAuditFunction,
 				items: [{
@@ -1294,7 +1296,7 @@
 					width: 150,
 					height: 50,
 					fieldLabel: "备注",
-					anchor: '97%'
+					anchor: '95%'
 				}]
 			}]
 		}],
@@ -1320,7 +1322,7 @@
 		autoHeight: true,
 		items: [{
 			layout: 'column',
-			columnWidth: .5,
+			columnWidth: columnWidth,
 			labelWidth: 90,
 			id: 'setLayout',
 			items: [{
@@ -1350,7 +1352,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'combo',
@@ -1384,7 +1386,7 @@
 				}]
 			}, {
 				layout: 'form',
-				columnWidth: .5,
+				columnWidth: columnWidth,
 				labelWidth: 90,
 				items: [{
 					xtype: 'combo',
@@ -1407,6 +1409,19 @@
 		}]
 	});
 
+	setStartDate(Ext, 'yyyy/MM/dd HH:mm', 'dateTime');  //（设置监测时间，取服务器时间 cjr）
+	if (Ext.getCmp('srDateTime')) {
+		setStartDate(Ext, 'yyyy/MM/dd', 'srDateTime');
+	}
+	Ext.getCmp('amount').setValue(1);
+	disableRecycleAndRepacking();
+}
+
+/**
+ * 添加或者修改定期监测实例.
+ * @param id
+ */
+function addRoutineMonitoring(id, sterilerConfirm) {
 	if (id != null && id != '') {
 		Ext.getCmp('formName').addClass("fieldReadOnlyNoRemove");
 		Ext.Ajax.request({
@@ -1559,12 +1574,7 @@
 			}
 		});
 	} else {
-		setStartDate(Ext, 'yyyy/MM/dd HH:mm', 'dateTime');  //（设置监测时间，取服务器时间 cjr）
-		if (Ext.getCmp('srDateTime')) {
-			setStartDate(Ext, 'yyyy/MM/dd', 'srDateTime');
-		}
-		Ext.getCmp('amount').setValue(1);
-		disableRecycleAndRepacking();
+		sterilerConfirmObj = sterilerConfirm || {};
 		formDefinitionStore.load();
 	}
 }
@@ -1909,6 +1919,10 @@
 	});
 }
 
+Ext.onReady(function () {
+	formPanel = getFormPanelContent(id);
+});
+
 function cancelRoutineMonitoring() {
 	if (top.Ext.getCmp('routineMonitoringWin')) {
 		top.Ext.getCmp('routineMonitoringWin').close();
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp
===================================================================
diff -u -r41119 -r41172
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp	(.../routineMonitoringForm.jsp)	(revision 41119)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp	(.../routineMonitoringForm.jsp)	(revision 41172)
@@ -16,6 +16,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>定期监测</title>
 </head>
 <body>
@@ -30,7 +31,7 @@
 //器械包类型:外来器械包、外来器械拆分小包
 var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
 var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
-
+var id = '${param.id}' || '';
 //自定义表单类型:定期监测、质量监测
 var formType_routineMonitoring = '<%=FormDefinition.FOMRTYPE_PERIODICMONITORING%>';
 var formType_qualityMonitoring = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r41119 -r41172
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 41119)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 41172)
@@ -12,7 +12,7 @@
 		height: 550,
 		id: 'routineMonitoringWin',
 		grid: gridView,
-		url: WWWROOT + '/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp'
+		url: WWWROOT + '/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp?id=' + id
 	}
 	getFormByIframeUtil(params, function (contentWindow) {
 		contentWindow.addRoutineMonitoring(id);