Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js =================================================================== diff -u -r41513 -r41518 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41513) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41518) @@ -688,6 +688,13 @@ //需要增加判空处理防止js报错 if (result.data) { Ext.getCmp('scope').setValue(result.data.scope); + //ZSYKEQ-54:抽检位置 + var responsibilityPart = result.data.responsibilityPart; + if (sstsConfig.enablePeriodicMonitoringRegisteredLocation && sstsConfig.haveSterilizerPosition && responsibilityPart == '灭菌管理') { + Ext.getCmp('positionNameBox').show(); + } else { + Ext.getCmp('positionNameBox').hide(); + } if ('器械包' == result.data.scope) { Ext.getCmp("tousseName").setVisible(true); Ext.getCmp("tousseName").getEl().up('.x-form-item').setDisplayed(true); @@ -1140,6 +1147,7 @@ layout: 'form', columnWidth: columnWidth, labelWidth: 90, + id: 'positionNameBox', hidden: !(sstsConfig.enablePeriodicMonitoringRegisteredLocation && sstsConfig.haveSterilizerPosition), items: [{ xtype: 'hidden', @@ -1152,14 +1160,20 @@ displayField: 'positionName', store: positionsStore, allowBlank: true, - editable: false, + forceSelection: true, triggerAction: 'all', name: "samplingPositionName", id: "samplingPositionName", anchor: '95%', listeners: { select: function (combo, record, index) { Ext.getCmp('samplingPositionId').setValue(record.data.id); + }, + blur: function () { + var samplingPositionName = Ext.getCmp('samplingPositionName').getRawValue(); + if (samplingPositionName == '') { + Ext.getCmp('samplingPositionId').setValue(''); + } } } }] @@ -1357,6 +1371,13 @@ }); } } + //ZSYKEQ-54:抽检位置 + var responsibilityPart = result.data.responsibilityPart; + if (sstsConfig.enablePeriodicMonitoringRegisteredLocation && sstsConfig.haveSterilizerPosition && responsibilityPart == '灭菌管理') { + Ext.getCmp('positionNameBox').show(); + } else { + Ext.getCmp('positionNameBox').hide(); + } if ('器械包' == result.data.scope) { Ext.getCmp("tousseName").setVisible(true);