Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r32954 -r33696 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 32954) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 33696) @@ -1710,6 +1710,29 @@ allowBlank: true, emptyText: '时间格式如:05:30' }] + }, { + layout: 'form', + labelWidth: 250, + columnWidth: .25, + items: [{ + xtype: 'combo', + fieldLabel: '只含植入物的外来器械包是否转换申请单', + id: 'isFtOnlyImplantConvert', + name: 'isFtOnlyImplantConvert', + valueField: 'value', + displayField: 'value', + mode: 'local', + anchor: '100%', + editable: false, + store: new Ext.data.SimpleStore({ + fields: ['value'], + data: [['是'], ['否']] + }), + value: '是', + forceSelection: true, + allowBlank: true, + triggerAction: 'all' + }] } ] @@ -3128,6 +3151,7 @@ } } var foreignTousseAppEndTime = Ext.getCmp("foreignTousseAppEndTime").getValue(); + var isFtOnlyImplantConvert = Ext.getCmp("isFtOnlyImplantConvert").getValue(); var unitName = Ext.getCmp("unitName").getValue(); var basketLoadeTousseAmount = Ext.getCmp("basketLoadeTousseAmount").getValue(); var customTousseDefaultTaskGroup = Ext.getCmp("customTousseDefaultTaskGroup").getValue(); @@ -3225,6 +3249,7 @@ foreignTousseNeedReview: foreignTousseNeedReview,// foreignTousseIsSecondRecycle: foreignTousseIsSecondRecycle, foreignTousseAppEndTime: foreignTousseAppEndTime, + isFtOnlyImplantConvert: isFtOnlyImplantConvert, ftDefaultSterilingMethod: ftDefaultSterilingMethod,// ftPrintOrgSource: ftPrintOrgSource, ftPrintAmount: ftPrintAmount, @@ -3514,20 +3539,21 @@ Ext.getCmp('urgentLevelId').setValue(supplyRoomConfig.urgentLevel.id); } //GYEY-759:【已装配】到【已审核】预计用时(分钟)和【已审核】到【开始灭菌】预计用时(分钟) - if(supplyRoomConfig.packingReviewTime){ + if (supplyRoomConfig.packingReviewTime) { Ext.getCmp('packingReviewTime').setValue(supplyRoomConfig.packingReviewTime); } - if(supplyRoomConfig.reviewSterilizationTime){ + if (supplyRoomConfig.reviewSterilizationTime) { Ext.getCmp('reviewSterilizationTime').setValue(supplyRoomConfig.reviewSterilizationTime); } - + var isFtOnlyImplantConvert = (supplyRoomConfig.isFtOnlyImplantConvert == true || supplyRoomConfig.isFtOnlyImplantConvert == 'true')?'是':'否'; Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint); Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint); Ext.getCmp('isCustomTousseCleanEntirely').setValue(supplyRoomConfig.isCustomTousseCleanEntirely); Ext.getCmp('foreignTousseCleanedEntirely').setValue(supplyRoomConfig.foreignTousseCleanedEntirely); Ext.getCmp('foreignTousseNeedReview').setValue(supplyRoomConfig.foreignTousseNeedReview); Ext.getCmp('foreignTousseIsSecondRecycle').setValue(supplyRoomConfig.foreignTousseIsSecondRecycle); Ext.getCmp('foreignTousseAppEndTime').setValue(supplyRoomConfig.foreignTousseAppEndTime); + Ext.getCmp('isFtOnlyImplantConvert').setValue(isFtOnlyImplantConvert); Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource); Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount); Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource);