Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualityControlIndicator/qualityControlIndicatorForm.js =================================================================== diff -u -r40968 -r40981 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualityControlIndicator/qualityControlIndicatorForm.js (.../qualityControlIndicatorForm.js) (revision 40968) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualityControlIndicator/qualityControlIndicatorForm.js (.../qualityControlIndicatorForm.js) (revision 40981) @@ -133,6 +133,25 @@ //显示窗口 function showAddOrEditWindow(id, name, targetValue) { + var store; + if (optionListId == 'parameter') { + store = new Ext4.data.Store({ + proxy: { + type: 'ajax', + url: WWWROOT + '/disinfectSystem/baseData/qualityControlIndicatorTypeController/loadQualityControlIndicatorTypeList.mhtml', + reader: { + root: 'data.list', + totalProperty: 'data.count' + }, + }, + fields: [ + { name: 'id' }, + { name: 'name' }, + { name: 'targetValue' } + ] + }) + store.load() + } formPanel = new top.Ext4.form.Panel({ id: 'configForm', frame: true, @@ -182,7 +201,7 @@ triggerAction: 'all', forceSelection: true, editable: false, - value: targetValue ? targetValue.split(' ')[0] : '≤', + value: '≤', store: new Ext4.data.Store({ fields: [{ name: 'value' }], data: [{ value: '≤' }, { value: '=' }, { value: '≥' }] @@ -201,7 +220,7 @@ allowBlank: true, allowDecimals: false, minValue: 0, - value: targetValue ? targetValue.split(' ')[1] : '', + value: '', anchor: '95%' }] }] @@ -222,21 +241,7 @@ minChars: 0, valueField: 'id', displayField: 'name', - store: new Ext4.data.Store({ - proxy: { - type: 'ajax', - url: WWWROOT + '/disinfectSystem/baseData/qualityControlIndicatorTypeController/loadQualityControlIndicatorTypeList.mhtml', - reader: { - root: 'data.list', - totalProperty: 'data.count' - }, - }, - fields: [ - { name: 'id' }, - { name: 'name' }, - { name: 'targetValue' } - ] - }), + store: store, forceSelection: true, lazyInit: true, triggerAction: 'all', @@ -279,5 +284,13 @@ }] }); configWin.show(); + if (targetValue) { + if (optionListId == 'parameter') { + top.Ext4.getCmp('qcIndicatorType_id').setValue(targetValue.id) + } else { + top.Ext4.getCmp('targetOption').setValue(targetValue.split(' ')[0]); + top.Ext4.getCmp('targetValue').setValue(targetValue.split(' ')[1]); + } + } } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js =================================================================== diff -u -r40968 -r40981 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 40968) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 40981) @@ -388,10 +388,7 @@ totalProperty: 'data.count' }, [ { name: 'id' }, - { name: 'name' }, - { name: 'qualityControlIndicatorType.name' }, - { name: 'qualityControlIndicatorType' }, - { name: 'targetValue' } + { name: 'name' } ]) }); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualityControlIndicator/qualityControlIndicatorView.js =================================================================== diff -u -r40968 -r40981 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualityControlIndicator/qualityControlIndicatorView.js (.../qualityControlIndicatorView.js) (revision 40968) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualityControlIndicator/qualityControlIndicatorView.js (.../qualityControlIndicatorView.js) (revision 40981) @@ -45,6 +45,9 @@ var id = selectedRecords[0].data['id']; var name = selectedRecords[0].data['name']; var targetValue = selectedRecords[0].data['targetValue']; + if (optionListId == 'parameter') { + targetValue = selectedRecords[0].data['qualityControlIndicatorType']; + } showAddOrEditWindow(id, name, targetValue); } }