Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r40496 -r40499 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40496) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40499) @@ -2694,8 +2694,8 @@ } } var tousseAndMaterialAllData = getAllTousseAndMaterialData(); + var responsiblePersonValue = ''; if (tousseAndMaterialAllData.length > 0) { - var responsiblePersonValue = ''; for (var i = 0; i < tousseAndMaterialAllData.length; i++) { var responsiblePerson = tousseAndMaterialAllData[i].responsiblePerson; if (responsiblePersonValue == '') { @@ -2706,29 +2706,41 @@ } } } - if (newResponsiblePerson) { - if (responsiblePersonValue.indexOf(newResponsiblePerson) == -1) { + } + var hiddenUser = top.Ext.getCmp('hiddenUser').getValue(); + if (hiddenUser !== '') { + if (responsiblePersonValue.indexOf(hiddenUser) == -1) { + if (responsiblePersonValue == '') { + responsiblePersonValue = hiddenUser; + }else { + responsiblePersonValue += ';' + hiddenUser; + } + } + } + if (newResponsiblePerson) { + if (responsiblePersonValue.indexOf(newResponsiblePerson) == -1) { + if (responsiblePersonValue == '') { + responsiblePersonValue = newResponsiblePerson; + }else { responsiblePersonValue += ';' + newResponsiblePerson; } + } + top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); + } else { + var responsiblePerson2 = top.Ext.getCmp('responsiblePerson').getValue(); + if (responsiblePerson2 == '') { top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); } else { - var responsiblePerson2 = top.Ext.getCmp('responsiblePerson').getValue(); - if (responsiblePerson2 == '') { - top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); - } else { - var arr = responsiblePerson2.split(';'); - if (responsiblePersonValue !== '') { - for (var i = 0; i < arr.length; i++) { - if (arr[i] !== oldResponsiblePerson && responsiblePersonValue.indexOf(arr[i]) == -1) { - responsiblePersonValue += ';' + arr[i]; - } + var arr = responsiblePerson2.split(';'); + if (responsiblePersonValue !== '') { + for (var i = 0; i < arr.length; i++) { + if (arr[i] !== oldResponsiblePerson && responsiblePersonValue.indexOf(arr[i]) == -1) { + responsiblePersonValue += ';' + arr[i]; } - top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); } + top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); } } - } else { - top.Ext.getCmp('responsiblePerson').setValue(newResponsiblePerson || ''); } } @@ -6015,8 +6027,10 @@ } if ((result.data.recyclingRecordJSON.reUser || '') !== '') { top.Ext.getCmp("recyclePerson").disable(); + var hiddenUser = top.Ext.getCmp("hiddenUser").getValue(); + top.Ext.getCmp("hiddenUser").setValue(result.data.recyclingRecordJSON.reUser); if (sstsConfig.enableAddingMultipleResponsiblePersons) { - getBarcodeResponsiblePerson('', result.data.recyclingRecordJSON.reUser); + getBarcodeResponsiblePerson(hiddenUser, ''); } } if ((result.data.recyclingRecordJSON.reDept || '') !== '') { @@ -7185,6 +7199,10 @@ height: setH, id: "tousseNameBasicsWrapper", items: [{ + xtype: 'hidden', + id: 'hiddenUser', + name: 'hiddenUser' + }, { xtype: 'textfield', name: 'tousseNameBasics', id: 'tousseNameBasics',