Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r36364 -r36367 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 36364) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 36367) @@ -4621,13 +4621,13 @@ layout: 'form', items: [{ xtype: 'hidden', - id: 'userIdOfReviewer', - name: 'userIdOfReviewer' + id: 'userIdOfVerifier', + name: 'userIdOfVerifier' }, { xtype: 'combo', - fieldLabel: '复核人', - id: 'reviewerName', - name: 'reviewerName', + fieldLabel: '核查人', + id: 'verifierName', + name: 'verifierName', queryParam: 'spell', minChars: 0, valueField: 'id', @@ -4642,11 +4642,11 @@ listeners: { select: function (combo, record, index) { var id = record.data.id; - top.Ext.getCmp('userIdOfReviewer').setValue(id); + top.Ext.getCmp('userIdOfVerifier').setValue(id); }, specialkey: function (thiz, e) { if (e.getKey() == 13) { - var peopleOfBarcode = top.Ext.getCmp('reviewerName').getRawValue(); + var peopleOfBarcode = top.Ext.getCmp('verifierName').getRawValue(); if (peopleOfBarcode !== '') { var url = WWWROOT + '/systemmanage/user/userAction!loadUserByBarcode.do'; Ext.Ajax.request({ @@ -4659,12 +4659,12 @@ if (result.success) { var name = result.data.name; var id = result.data.id; - top.Ext.getCmp('reviewerName').setRawValue(name); - top.Ext.getCmp('userIdOfReviewer').setValue(id); + top.Ext.getCmp('verifierName').setRawValue(name); + top.Ext.getCmp('userIdOfVerifier').setValue(id); } else { showMultipleResult(result.message); - top.Ext.getCmp('reviewerName').setRawValue(''); - top.Ext.getCmp('userIdOfReviewer').setValue(''); + top.Ext.getCmp('verifierName').setRawValue(''); + top.Ext.getCmp('userIdOfVerifier').setValue(''); } } }); @@ -4678,13 +4678,13 @@ layout: 'form', items: [{ xtype: 'hidden', - id: 'userIdOfVerifier', - name: 'userIdOfVerifier' + id: 'userIdOfReviewer', + name: 'userIdOfReviewer' }, { xtype: 'combo', - fieldLabel: '核查人', - id: 'verifierName', - name: 'verifierName', + fieldLabel: '复核人', + id: 'reviewerName', + name: 'reviewerName', queryParam: 'spell', minChars: 0, valueField: 'id', @@ -4699,11 +4699,11 @@ listeners: { select: function (combo, record, index) { var id = record.data.id; - top.Ext.getCmp('userIdOfVerifier').setValue(id); + top.Ext.getCmp('userIdOfReviewer').setValue(id); }, specialkey: function (thiz, e) { if (e.getKey() == 13) { - var peopleOfBarcode = top.Ext.getCmp('verifierName').getRawValue(); + var peopleOfBarcode = top.Ext.getCmp('reviewerName').getRawValue(); if (peopleOfBarcode !== '') { var url = WWWROOT + '/systemmanage/user/userAction!loadUserByBarcode.do'; Ext.Ajax.request({ @@ -4716,12 +4716,12 @@ if (result.success) { var name = result.data.name; var id = result.data.id; - top.Ext.getCmp('verifierName').setRawValue(name); - top.Ext.getCmp('userIdOfVerifier').setValue(id); + top.Ext.getCmp('reviewerName').setRawValue(name); + top.Ext.getCmp('userIdOfReviewer').setValue(id); } else { showMultipleResult(result.message); - top.Ext.getCmp('verifierName').setRawValue(''); - top.Ext.getCmp('userIdOfVerifier').setValue(''); + top.Ext.getCmp('reviewerName').setRawValue(''); + top.Ext.getCmp('userIdOfReviewer').setValue(''); } } }); @@ -5853,6 +5853,7 @@ 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 || ''); @@ -5861,6 +5862,7 @@ 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(); if(sr.reviewers){