Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js =================================================================== diff -u -r41145 -r41149 --- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js (.../instrumentRepairManagementForm.js) (revision 41145) +++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js (.../instrumentRepairManagementForm.js) (revision 41149) @@ -467,6 +467,16 @@ if (sstsConfig.enableInstrumentLifeCycleTraceabilityManagement) { hiddenBarcode = false; } + var instrumentSerialNumberIsHidden = false; + var hiddenFieldsForInstrumentRepairRecords = sstsConfig.hiddenFieldsForInstrumentRepairRecords || []; + if (hiddenFieldsForInstrumentRepairRecords.length > 0) { + for (var i = 0; i < hiddenFieldsForInstrumentRepairRecords.length; i++) { + var item = hiddenFieldsForInstrumentRepairRecords[i]; + if (item == '序列号') { + instrumentSerialNumberIsHidden = true; + } + } + } var item = [{ columnWidth: 0.29, layout: 'form', @@ -683,6 +693,7 @@ layout: 'form', border: 0, style: 'margin-bottom:10px', + hidden: instrumentSerialNumberIsHidden, items: [{ xtype: 'textfield', fieldLabel: '序列号', @@ -735,6 +746,8 @@ var uniqueTousseIsHidden = false; var infectedIsHidden = false; var repairDescIsHidden = false; + var instrumentSerialNumberIsHidden = false; + var engineerPhoneNumberIsHidden = false; var hiddenFieldsForInstrumentRepairRecords = sstsConfig.hiddenFieldsForInstrumentRepairRecords || []; if (hiddenFieldsForInstrumentRepairRecords.length > 0) { for (var i = 0; i < hiddenFieldsForInstrumentRepairRecords.length; i++) { @@ -781,6 +794,12 @@ if (item == '器械故障现象描述并标记故障点') { repairDescIsHidden = true; } + if (item == '序列号') { + instrumentSerialNumberIsHidden = true; + } + if (item == '工程师电话') { + engineerPhoneNumberIsHidden = true; + } } } var dateXtype = 'datetimefield'; @@ -1105,6 +1124,7 @@ layout: 'form', border: 0, style: 'margin-bottom:10px', + hidden: instrumentSerialNumberIsHidden, items: [{ xtype: 'textfield', fieldLabel: '序列号', @@ -1197,7 +1217,7 @@ layout: 'form', border: 0, style: 'margin-bottom:10px', - hidden: engineerIsHidden, + hidden: engineerPhoneNumberIsHidden, items: [{ xtype: 'textfield', fieldLabel: '工程师电话',