Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js
===================================================================
diff -u -r40678 -r40685
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40678)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40685)
@@ -995,10 +995,10 @@
{hidden :SSTS_ProjectName_manager,text:"设备维护项目名称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=projectName',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue.mhtml?listId=packType',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_equipment_manager,text:"设备设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=equipment',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=washMethod',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_CleanType_Select,text:"清洗类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp?optionListId=cleanType',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp?optionListId=washMethod',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置'),hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_DiposableGoodsType_manager,text:"一次性物品类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=diposableGoodsType',hrefTarget:linkTarget,leaf:true},
-
{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=expensiveGoodsType',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Container,text:"容器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/container/containerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Supplier,text:"供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/supplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js
===================================================================
diff -u -r34073 -r40685
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js (.../cleanMethodForm.js) (revision 34073)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js (.../cleanMethodForm.js) (revision 40685)
@@ -42,6 +42,26 @@
]
})
})
+ //清洗类型数据
+ var cleanTypeItems = Ext.data.Record.create([
+ { name: 'id', type: 'string' },
+ { name: 'value', type: 'string' }
+ ]);
+ var cleanTypeStore = new Ext.data.JsonStore({
+ url: WWWROOT + '/disinfectSystem/core/httpOptionController/getHttpOptionList.mhtml?optionListId=' + optionType_cleanType,
+ root: 'data',
+ fields: [
+ {name : 'value',mapping : 'value'},
+ {name : 'id',mapping : 'id'}
+ ],
+ listeners: {
+ load: function (thiz, records, options) {
+ if (records.length > 0) {
+ cleanTypeStore.insert(0, new cleanTypeItems({ 'id': '', 'value': ' ' }));
+ }
+ }
+ }
+ });
var consumptiveMaterialGrid = new top.Ext.grid.EditorGridPanel({
id: 'consumptiveMaterialGrid',
bodyStyle: 'border:1px solid #afd7af',
@@ -199,6 +219,25 @@
allowBlank: true,
anchor: '90%'
}]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ hidden:!sstsConfig.enableTypesOfWashingFunction,
+ items:[{
+ xtype : 'combo',
+ fieldLabel : '清洗类型',
+ id : 'cleanType',
+ name : 'cleanType',
+ width : 130,
+ valueField : 'value',
+ displayField : 'value',
+ store : cleanTypeStore,
+ allowBlank: true,
+ editable:false,
+ forceSelection : true,
+ triggerAction : 'all',
+ anchor: '90%'
+ }]
}, {
columnWidth: 1,
layout: 'form',
@@ -327,6 +366,12 @@
}
}
}
+ if(sstsConfig.enableTypesOfWashingFunction){
+ var cleanType = top.Ext.getCmp('cleanType').getValue();
+ if(cleanType == ' '){
+ top.Ext.getCmp('cleanType').setValue('');
+ }
+ }
formObj.form.submit({
url: WWWROOT + '/disinfectSystem/baseData/cleanMethodAction!saveCleanMethod.do',
method: 'POST',
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
===================================================================
diff -u -r40302 -r40685
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 40685)
@@ -332,7 +332,8 @@
enableAvailableWashProgramsOfTousseFunction:true,
//启用默认定期监测提醒功能
enableDefaultQualityMonitoringDefinitionAlerts:true,
- enableCompletionSterilizationRequiresRegistrationQualityMonitoringRecords:true,
- //提取诊疗号的正则表达式
+ //启用清洗类型功能
+ enableTypesOfWashingFunction:true,
+ //提取诊疗号的正则表达式
regExpForExtractingClinicNumber:"[0-9]+"
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp
===================================================================
diff -u -r29513 -r40685
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp (.../cleanMethodView.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp (.../cleanMethodView.jsp) (revision 40685)
@@ -1,5 +1,6 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
+<%@page import="com.forgon.systemsetting.model.HttpOption"%>
@@ -57,15 +58,7 @@
SSTS_CleanMethodBarcode_Print = false;
-var enableEditBtn = false;
-var enableSaveBtn = false;
-var enableSaveAndNewBtn = false;
-
-enableEditBtn = true;
-
-
-enableSaveBtn = true;
-
+var optionType_cleanType = '<%=HttpOption.SYSTEMSETTING_CLEAN_TYPE%>';
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r40531 -r40685
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 40531)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 40685)
@@ -733,6 +733,11 @@
+
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js
===================================================================
diff -u -r32837 -r40685
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js (.../cleanMethodView.js) (revision 32837)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js (.../cleanMethodView.js) (revision 40685)
@@ -71,6 +71,7 @@
{header : "清洗程序",width : 120,dataIndex : 'cleanMethod'},
{header : "清洗时间(分)",width : 120,dataIndex : 'cleanMinutes'},
{header : "A。值",width : 120,dataIndex : 'value'},
+ {header : "清洗类型",width : 120,dataIndex : 'cleanType',hidden:!sstsConfig.enableTypesOfWashingFunction},
{id : 'cleanMinutes',header : "洗清程序参数",width : 120,dataIndex : 'cleanParameter'}
];
@@ -80,6 +81,7 @@
{type:'string',dataIndex:'cleanMethod'},
{type:'string',dataIndex:'value'},
{type:'string',dataIndex:'cleanParameter'},
+ {type:'string',dataIndex:'cleanType'},
{type:'numeric',dataIndex:'cleanMinutes'}
]
});
@@ -96,6 +98,8 @@
name : 'value'
},{
name : 'cleanParameter'
+ },{
+ name : 'cleanType'
}];
var sign = true;