Index: ssts-web/src/main/webapp/systemmanage/timeoutSetting.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/systemmanage/timeoutSetting.js (revision 0)
+++ ssts-web/src/main/webapp/systemmanage/timeoutSetting.js (revision 14183)
@@ -0,0 +1,132 @@
+
+Ext4.onReady(function(){
+ Ext4.QuickTips.init();
+
+ var yesNoStore = new Ext4.data.Store( {
+ fields : [{name:'value'},{name:'text'}],
+ data : [{value:'0',text:'是'}, {value:'1',text:'否'}]
+ });
+
+ var formObj = new Ext4.form.Panel({
+ frame:true,
+ labelSeparator:'：',
+ title: '各环节超时时间设置',
+ //bodyStyle:'padding:5px 5px 0px 25px',
+ width: 600,
+ items: [{
+ 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:'recycleToWashHour',
+ name:'recycleToWashHour',
+ labelWidth:'100',
+ labelAlign: 'right',
+ fieldLabel: '小时',
+ allowBlank:false,
+ regex:/^[0-9]\d*$/,
+ regexText:'请输入数字'
+ }]
+ },{
+ layout:'form',
+ columnWidth:0.5,
+ border:0,
+ items:[{
+ xtype:'textfield',
+ id:'recycleToWashMinute',
+ name:'recycleToWashMinute',
+ 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:'recycleToWashShowMessageBox',
+ name: 'recycleToWashShowMessageBox',
+ store:yesNoStore,
+ labelWidth:'110',
+ labelAlign: 'right',
+ fieldLabel: '是否显示提示框',
+ valueField : 'value',
+ displayField : 'text',
+ forceSelection : true,
+ editable:false,
+ allowBlank:false,
+ triggerAction : 'all'
+ }]
+ }]
+ }],
+
+ buttons: [{
+ id:'saveBtn',
+ text: '确认',
+ handler: save
+ },{
+ text: '取消',
+ handler:function(){history.go(-1);}
+ }]
+ });
+
+ formObj.render("formDiv");
+ //加载数据
+ Ext4.Ajax.request({
+ url : WWWROOT + '/system/timeoutAction!load.do',
+ success : function(response, options) {
+ var result = Ext4.decode(response.responseText);
+ if(result.success){
+ Ext4.getCmp('recycleToWashHour').setValue(result.recycleToWashHour);
+ Ext4.getCmp('recycleToWashMinute').setValue(result.recycleToWashMinute);
+ Ext4.getCmp('recycleToWashShowMessageBox').setValue(result.recycleToWashShowMessageBox);
+ }
+ },
+ failure : function(response, options) {
+ }
+ });
+
+ function checkModuleTextIsExist(moduleStr,poModuleName,moduleCmpId){}
+
+ function save(){
+ if(!formObj.isValid()){
+ showResult('请正确输入表单各值');
+ return;
+ }
+ formObj.submit({
+ clientValidation: true,
+ url: WWWROOT + '/system/timeoutAction!save.do',
+// params: {
+// newStatus: 'delivered'
+// },
+ success: function(form, action) {
+ showResult(action.result.message);
+ },
+ failure: function(form, action) {
+ if(action.result.message){
+ showResult(action.result.message);
+ }else{
+ showResult('保存失败');
+ }
+ }
+ });
+ }
+
+});
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/timeout/model/TimeoutParameter.java
===================================================================
diff -u
--- ssts-web/src/main/java/com/forgon/disinfectsystem/timeout/model/TimeoutParameter.java (revision 0)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/timeout/model/TimeoutParameter.java (revision 14183)
@@ -0,0 +1,130 @@
+package com.forgon.disinfectsystem.timeout.model;
+
+public class TimeoutParameter {
+ /**
+ * 回收到清洗的小时数
+ */
+ private String recycleToWashHour;
+ /**
+ * 回收到清洗的分钟数
+ */
+ private String recycleToWashMinute;
+ /**
+ * 回收到清洗是否显示提示框
+ */
+ private String recycleToWashShowMessageBox;
+
+ /**
+ * 清洗到装配的小时数
+ */
+ private String washToPackingHour;
+ /**
+ * 清洗到装配的分钟数
+ */
+ private String washToPackingMinute;
+ /**
+ * 清洗到装配是否显示提示框
+ */
+ private String washToPackingShowMessageBox;
+
+ /**
+ * 装配到审核的小时数
+ */
+ private String packingToReviewHour;
+ /**
+ * 装配到审核的分钟数
+ */
+ private String packingToReviewMinute;
+ /**
+ * 装配到审核是否显示提示框
+ */
+ private String packingToReviewShowMessageBox;
+
+ /**
+ * 审核到灭菌的小时数
+ */
+ private String reviewToSterileHour;
+ /**
+ * 审核到灭菌的分钟数
+ */
+ private String reviewToSterileMinute;
+ /**
+ * 审核到灭菌是否显示提示框
+ */
+ private String reviewToSterileShowMessageBox;
+
+ public String getRecycleToWashHour() {
+ return recycleToWashHour;
+ }
+ public void setRecycleToWashHour(String recycleToWashHour) {
+ this.recycleToWashHour = recycleToWashHour;
+ }
+ public String getRecycleToWashMinute() {
+ return recycleToWashMinute;
+ }
+ public void setRecycleToWashMinute(String recycleToWashMinute) {
+ this.recycleToWashMinute = recycleToWashMinute;
+ }
+ public String getRecycleToWashShowMessageBox() {
+ return recycleToWashShowMessageBox;
+ }
+ public void setRecycleToWashShowMessageBox(String recycleToWashShowMessageBox) {
+ this.recycleToWashShowMessageBox = recycleToWashShowMessageBox;
+ }
+ public String getWashToPackingHour() {
+ return washToPackingHour;
+ }
+ public void setWashToPackingHour(String washToPackingHour) {
+ this.washToPackingHour = washToPackingHour;
+ }
+ public String getWashToPackingMinute() {
+ return washToPackingMinute;
+ }
+ public void setWashToPackingMinute(String washToPackingMinute) {
+ this.washToPackingMinute = washToPackingMinute;
+ }
+ public String getWashToPackingShowMessageBox() {
+ return washToPackingShowMessageBox;
+ }
+ public void setWashToPackingShowMessageBox(String washToPackingShowMessageBox) {
+ this.washToPackingShowMessageBox = washToPackingShowMessageBox;
+ }
+ public String getPackingToReviewHour() {
+ return packingToReviewHour;
+ }
+ public void setPackingToReviewHour(String packingToReviewHour) {
+ this.packingToReviewHour = packingToReviewHour;
+ }
+ public String getPackingToReviewMinute() {
+ return packingToReviewMinute;
+ }
+ public void setPackingToReviewMinute(String packingToReviewMinute) {
+ this.packingToReviewMinute = packingToReviewMinute;
+ }
+ public String getPackingToReviewShowMessageBox() {
+ return packingToReviewShowMessageBox;
+ }
+ public void setPackingToReviewShowMessageBox(
+ String packingToReviewShowMessageBox) {
+ this.packingToReviewShowMessageBox = packingToReviewShowMessageBox;
+ }
+ public String getReviewToSterileHour() {
+ return reviewToSterileHour;
+ }
+ public void setReviewToSterileHour(String reviewToSterileHour) {
+ this.reviewToSterileHour = reviewToSterileHour;
+ }
+ public String getReviewToSterileMinute() {
+ return reviewToSterileMinute;
+ }
+ public void setReviewToSterileMinute(String reviewToSterileMinute) {
+ this.reviewToSterileMinute = reviewToSterileMinute;
+ }
+ public String getReviewToSterileShowMessageBox() {
+ return reviewToSterileShowMessageBox;
+ }
+ public void setReviewToSterileShowMessageBox(
+ String reviewToSterileShowMessageBox) {
+ this.reviewToSterileShowMessageBox = reviewToSterileShowMessageBox;
+ }
+}
Index: ssts-web/src/main/resources/spring/applicationContext-service.xml
===================================================================
diff -u -r12335 -r14183
--- ssts-web/src/main/resources/spring/applicationContext-service.xml (.../applicationContext-service.xml) (revision 12335)
+++ ssts-web/src/main/resources/spring/applicationContext-service.xml (.../applicationContext-service.xml) (revision 14183)
@@ -765,6 +765,16 @@