Index: ssts-web/src/main/webapp/systemmanage/timeoutSetting.js
===================================================================
diff -u -r14183 -r14187
--- ssts-web/src/main/webapp/systemmanage/timeoutSetting.js	(.../timeoutSetting.js)	(revision 14183)
+++ ssts-web/src/main/webapp/systemmanage/timeoutSetting.js	(.../timeoutSetting.js)	(revision 14187)
@@ -75,6 +75,192 @@
 					triggerAction : 'all'
 				}]
 			}]
+		},{
+			xtype : "panel",
+			title : '清洗到装配',
+			layout:'column',
+			autoHeight :true ,
+			items : [{
+				xtype : "fieldset",
+				title : '超时时间',
+				layout:'column',
+				autoHeight :true ,
+				columnWidth:1,
+				items : [{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'washToPackingHour',
+						name:'washToPackingHour',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '小时',
+						allowBlank:false,
+						regex:/^[0-9]\d*$/,
+						regexText:'请输入数字'
+					}]
+				},{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'washToPackingMinute',
+						name:'washToPackingMinute',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '分钟',
+						allowBlank:false,
+						regex:/^[0-9]$|^[0-5][0-9]$/,
+						regexText:'请输入0到59的数字'
+					}]
+				}]
+			},{
+				layout : 'form',
+				columnWidth : 1,
+				border:0,
+				items : [{
+					xtype:'combobox',
+					id:'washToPackingShowMessageBox',
+					name: 'washToPackingShowMessageBox',
+					store:yesNoStore,
+					labelWidth:'110',
+					labelAlign: 'right',
+			        fieldLabel: '是否显示提示框',
+			        valueField : 'value',
+					displayField : 'text',
+					forceSelection : true,
+					editable:false,
+					allowBlank:false,
+					triggerAction : 'all'
+				}]
+			}]
+		},{
+			xtype : "panel",
+			title : '装配到审核',
+			layout:'column',
+			autoHeight :true ,
+			items : [{
+				xtype : "fieldset",
+				title : '超时时间',
+				layout:'column',
+				autoHeight :true ,
+				columnWidth:1,
+				items : [{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'packingToReviewHour',
+						name:'packingToReviewHour',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '小时',
+						allowBlank:false,
+						regex:/^[0-9]\d*$/,
+						regexText:'请输入数字'
+					}]
+				},{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'packingToReviewMinute',
+						name:'packingToReviewMinute',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '分钟',
+						allowBlank:false,
+						regex:/^[0-9]$|^[0-5][0-9]$/,
+						regexText:'请输入0到59的数字'
+					}]
+				}]
+			},{
+				layout : 'form',
+				columnWidth : 1,
+				border:0,
+				items : [{
+					xtype:'combobox',
+					id:'packingToReviewShowMessageBox',
+					name: 'packingToReviewShowMessageBox',
+					store:yesNoStore,
+					labelWidth:'110',
+					labelAlign: 'right',
+			        fieldLabel: '是否显示提示框',
+			        valueField : 'value',
+					displayField : 'text',
+					forceSelection : true,
+					editable:false,
+					allowBlank:false,
+					triggerAction : 'all'
+				}]
+			}]
+		},{
+			xtype : "panel",
+			title : '审核到灭菌',
+			layout:'column',
+			autoHeight :true ,
+			items : [{
+				xtype : "fieldset",
+				title : '超时时间',
+				layout:'column',
+				autoHeight :true ,
+				columnWidth:1,
+				items : [{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'reviewToSterileHour',
+						name:'reviewToSterileHour',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '小时',
+						allowBlank:false,
+						regex:/^[0-9]\d*$/,
+						regexText:'请输入数字'
+					}]
+				},{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'reviewToSterileMinute',
+						name:'reviewToSterileMinute',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '分钟',
+						allowBlank:false,
+						regex:/^[0-9]$|^[0-5][0-9]$/,
+						regexText:'请输入0到59的数字'
+					}]
+				}]
+			},{
+				layout : 'form',
+				columnWidth : 1,
+				border:0,
+				items : [{
+					xtype:'combobox',
+					id:'reviewToSterileShowMessageBox',
+					name: 'reviewToSterileShowMessageBox',
+					store:yesNoStore,
+					labelWidth:'110',
+					labelAlign: 'right',
+			        fieldLabel: '是否显示提示框',
+			        valueField : 'value',
+					displayField : 'text',
+					forceSelection : true,
+					editable:false,
+					allowBlank:false,
+					triggerAction : 'all'
+				}]
+			}]
 		}],
 
         buttons: [{
@@ -97,6 +283,18 @@
 				Ext4.getCmp('recycleToWashHour').setValue(result.recycleToWashHour);
 				Ext4.getCmp('recycleToWashMinute').setValue(result.recycleToWashMinute);
 				Ext4.getCmp('recycleToWashShowMessageBox').setValue(result.recycleToWashShowMessageBox);
+				
+				Ext4.getCmp('washToPackingHour').setValue(result.washToPackingHour);
+				Ext4.getCmp('washToPackingMinute').setValue(result.washToPackingMinute);
+				Ext4.getCmp('washToPackingShowMessageBox').setValue(result.washToPackingShowMessageBox);
+				
+				Ext4.getCmp('packingToReviewHour').setValue(result.packingToReviewHour);
+				Ext4.getCmp('packingToReviewMinute').setValue(result.packingToReviewMinute);
+				Ext4.getCmp('packingToReviewShowMessageBox').setValue(result.packingToReviewShowMessageBox);
+				
+				Ext4.getCmp('reviewToSterileHour').setValue(result.reviewToSterileHour);
+				Ext4.getCmp('reviewToSterileMinute').setValue(result.reviewToSterileMinute);
+				Ext4.getCmp('reviewToSterileShowMessageBox').setValue(result.reviewToSterileShowMessageBox);
 			}
 		},
 		failure : function(response, options) {
@@ -113,9 +311,6 @@
     	formObj.submit({
     	    clientValidation: true,
     	    url: WWWROOT + '/system/timeoutAction!save.do',
-//    	    params: {
-//    	        newStatus: 'delivered'
-//    	    },
     	    success: function(form, action) {
     	    	showResult(action.result.message);
     	    },