Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r37326 -r37363 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 37326) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 37363) @@ -916,6 +916,7 @@ selectEmptyDo(); top.Ext.getCmp('qualifiedInformationSet').setVisible(true); }else if(isQualified == '否'){ + top.Ext.getCmp('isQualified').setValue('否'); return }else { var recordQualifiedInformation = result.data.recordQualifiedInformation; @@ -927,6 +928,8 @@ top.Ext.getCmp('isQualified').setValue('否'); } } + }else { + top.Ext.getCmp('isQualified').setValue('否'); } } }, @@ -3325,8 +3328,8 @@ if(sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction){ var recordQualifiedInformation = result.data.recordRecycleInformation; var isQualified = result.data.isQualified; + top.Ext.getCmp('isQualified').setValue(isQualified); if(recordQualifiedInformation == '是'){ - top.Ext.getCmp('isQualified').setValue(isQualified); if(isQualified == '是'){ selectEmptyDo(); top.Ext.getCmp('qualifiedInformationSet').setVisible(true); @@ -3336,6 +3339,8 @@ }else { top.Ext.getCmp('qualifiedInformationSet').setVisible(false); } + }else { + top.Ext.getCmp('isQualified').setValue('否'); } } else { showResultQM("找不到该条码所对应的器械包实例"); @@ -4221,11 +4226,13 @@ var tousseInstanceId = qualityMonitoringGoodsList[i].tousseInstanceId; var tousseName = qualityMonitoringGoodsList[i].tousseName; var amount = qualityMonitoringGoodsList[i].amount; + var tousseDefinitionId = qualityMonitoringGoodsList[i].tousseDefinitionId; var isReprint = qualityMonitoringGoodsList[i].isReprint; top.Ext.getCmp('tousseInstanceId').setValue(tousseInstanceId); top.Ext.getCmp('tempBarcode').setValue(barcode); top.Ext.getCmp('tousseName').setValue(tousseName); top.Ext.getCmp('tousseAmount').setValue(amount); + top.Ext.getCmp('tousseDefinitionId').setValue(tousseDefinitionId); if ('是' == qualityMonitoringGoodsList[i].isRecycle) { top.Ext.getCmp('isRecycle').setValue(qualityMonitoringGoodsList[i].isRecycle); top.Ext.getCmp('isRepacking').setValue('否'); @@ -5417,7 +5424,7 @@ fields: ['value'], data: [['是'], ['否']] }), - value: '是', + value: sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction?'是':'否', forceSelection: true, mode: 'local', triggerAction: 'all',