Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r38521 -r38597 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 38521) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 38597) @@ -2176,8 +2176,21 @@ allowBlank: true, triggerAction: 'all' }] + }, { + layout: 'form', + labelWidth: 180, + columnWidth: .25, + hidden: !sstsConfig.foreignTousseAddWeight, + items: [{ + xtype: 'numberfield', + fieldLabel: '外来器械包最大重量(kg)', + id: 'ftMaxWeight', + name: 'ftMaxWeight', + anchor: '100%', + allowBlank: true, + allowNegative: false + }] } - ] }, { @@ -4102,6 +4115,11 @@ } //NFYY-90:更改病人信息是否记录到备注 var saveFtaModPatientInfoRemark = Ext.getCmp("saveFtaModPatientInfoRemark").getValue(); + //DGZYY-234:新增字段“外来器械包最大重量(kg)” + var ftMaxWeight = ''; + if (sstsConfig.foreignTousseAddWeight) { + ftMaxWeight = Ext.getCmp("ftMaxWeight").getValue(); + } var unitName = Ext.getCmp("unitName").getValue(); var basketLoadeTousseAmount = Ext.getCmp("basketLoadeTousseAmount").getValue(); var customTousseDefaultTaskGroup = Ext.getCmp("customTousseDefaultTaskGroup").getValue(); @@ -4244,6 +4262,7 @@ isFtOnlyImplantConvert: isFtOnlyImplantConvert, pdaHandoverSignature: pdaHandoverSignature, saveFtaModPatientInfoRemark: saveFtaModPatientInfoRemark, + ftMaxWeight: ftMaxWeight, ftDefaultSterilingMethod: ftDefaultSterilingMethod,// ftPrintOrgSource: ftPrintOrgSource, ftPrintAmount: ftPrintAmount, @@ -4648,6 +4667,7 @@ Ext.getCmp('isFtOnlyImplantConvert').setValue(isFtOnlyImplantConvert); Ext.getCmp('pdaHandoverSignature').setValue(supplyRoomConfig.pdaHandoverSignature || pdahandoversignature_enableAndNotEmpty); Ext.getCmp('saveFtaModPatientInfoRemark').setValue(supplyRoomConfig.saveFtaModPatientInfoRemark); + Ext.getCmp('ftMaxWeight').setValue(supplyRoomConfig.ftMaxWeight); Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource); Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount); Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource);