Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js =================================================================== diff -u -r40839 -r40846 --- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js (.../instrumentRepairManagementForm.js) (revision 40839) +++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js (.../instrumentRepairManagementForm.js) (revision 40846) @@ -93,10 +93,13 @@ function loadInstrumentInstanceByBarcode(instrumentBarcode, index) { var tousseDefinitionId = ''; + var idCardInstanceBarcode = ''; if (index == undefined) { tousseDefinitionId = top.Ext4.getCmp('tousseDefinitionID').getValue(); + idCardInstanceBarcode = top.Ext4.getCmp('idCardInstanceBarcode').getValue(); } else { tousseDefinitionId = top.Ext4.getCmp('tousseDefinitionID_' + index).getValue(); + idCardInstanceBarcode = top.Ext4.getCmp('idCardInstanceBarcode_' + index).getValue(); } if (tousseDefinitionId == '') { showResult('请先扫描标识牌!') @@ -106,6 +109,9 @@ instrumentBarcode: instrumentBarcode, tousseDefinitionId: tousseDefinitionId } + if(idCardInstanceBarcode !== ''){ + params.idCardInstanceBarcode = idCardInstanceBarcode; + } Ext4.Ajax.request({ url: WWWROOT + '/disinfectSystem/baseData/instrumentInstanceController/loadInstrumentInstanceByBarcode.mhtml', params: params, Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js =================================================================== diff -u -r40839 -r40846 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js (.../tousseMaintainForm.js) (revision 40839) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js (.../tousseMaintainForm.js) (revision 40846) @@ -4,6 +4,8 @@ //BJDXZLYY-70:扫描器械 function loadInstrumentInstanceByBarcode(instrumentBarcode) { var tousseDefinitionId = top.Ext.getCmp('tousseDefinitionId').getValue(); + var idCardInstanceIDBarcode = top.Ext.getCmp('idCardInstanceIDBarcode').getValue(); + if (tousseDefinitionId == '') { showResult('请先扫描器械包!') return @@ -12,6 +14,10 @@ instrumentBarcode: instrumentBarcode, tousseDefinitionId: tousseDefinitionId } + + if(idCardInstanceIDBarcode !== ''){ + params.idCardInstanceIDBarcode = idCardInstanceIDBarcode; + } Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/baseData/instrumentInstanceController/loadInstrumentInstanceByBarcode.mhtml', params: params,