Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r36320 -r36346 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 36320) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 36346) @@ -3996,14 +3996,19 @@ top.Ext.getCmp('checkTousseAmount').allowBlank = true; top.Ext.getCmp('reviewerName').allowBlank = true; top.Ext.getCmp('verifierName').allowBlank = true; + top.Ext.getCmp('doubleCheckOfSterilizationBox').hide(); + top.Ext.getCmp('totalAmount').show(); } else { top.Ext.getCmp("checkTousseAmount").getEl().dom.readOnly = false; top.Ext.getCmp('isDoubleCheckOfSterilization').setValue(result.data.isDoubleCheckOfSterilization); top.Ext.getCmp('typeTotalAmount').hide(); top.Ext.getCmp('checkTousseAmount').allowBlank = false; top.Ext.getCmp('reviewerName').allowBlank = false; top.Ext.getCmp('verifierName').allowBlank = false; + top.Ext.getCmp('doubleCheckOfSterilizationBox').show(); + top.Ext.getCmp('totalAmount').hide(); } + top.Ext.getCmp('formDefinitionItems').doLayout(); } } } @@ -4564,7 +4569,8 @@ }, { columnWidth: 1, layout: 'column', - hidden: !sstsConfig.enableDoubleCheckOfSterilizationFunction, + id:'doubleCheckOfSterilizationBox', + hidden: true, items: [{ columnWidth: .33, layout: 'form', @@ -4867,7 +4873,7 @@ }, "->", { xtype: 'button', id: 'totalAmount', - hidden: sstsConfig.enableDoubleCheckOfSterilizationFunction + hidden: false }, { xtype: 'hidden', id: 'foreignTousseAmount', @@ -5814,6 +5820,8 @@ top.Ext.getCmp('checkTousseAmount').allowBlank = true; top.Ext.getCmp('reviewerName').allowBlank = true; top.Ext.getCmp('verifierName').allowBlank = true; + top.Ext.getCmp('doubleCheckOfSterilizationBox').hide(); + top.Ext.getCmp('totalAmount').show(); } else { top.Ext.getCmp("checkTousseAmount").getEl().dom.readOnly = false; top.Ext.getCmp('checkTousseAmount').setValue(sr.checkTousseAmount || ''); @@ -5822,6 +5830,8 @@ top.Ext.getCmp('checkTousseAmount').allowBlank = false; top.Ext.getCmp('reviewerName').allowBlank = false; top.Ext.getCmp('verifierName').allowBlank = false; + top.Ext.getCmp('doubleCheckOfSterilizationBox').show(); + top.Ext.getCmp('totalAmount').hide(); } if(sr.reviewers){ top.Ext.getCmp('reviewerName').setRawValue(sr.reviewers.fullName); @@ -6098,7 +6108,6 @@ }); } } - //保存自定义表单 function saveFormInstance(params) { Ext.Ajax.request({