Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r24541 -r24542 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 24541) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 24542) @@ -1505,29 +1505,30 @@ //simon-add:如果没有配置默认结算科室,设置当前申请科室为默认值 top.Ext4.getCmp('settleAccountsDepart').setValue(depart); top.Ext4.getCmp('settleAccountsDepartCoding').setValue(deptCoding); - //simon-add - //如果申请科室配置了结算科室,那么采用此结算科室为默认值。 - //根据申请科室deptCoding 查找结算科室 - Ext4.Ajax.request({ - url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSupplyRoomConfigByCoding.do', - params : {'orgUnitCode':deptCoding,'type':3}, - timeout : 600000, - success : function(response, options) { - var result= Ext4.JSON.decode(response.responseText); - //simon-add:如果申请科室配置的默认结算科室不为空,那么设置此值为页面结算科室默认值 - if(!isUndefinedOrNullOrEmpty(result.settleAccountsDepart)&&!isUndefinedOrNullOrEmpty(result.settleAccountsDepartCoding)){ - top.Ext4.getCmp('settleAccountsDepart').setValue(result.settleAccountsDepart); - top.Ext4.getCmp('settleAccountsDepartCoding').setValue(result.settleAccountsDepartCoding); - } - }, - failure : function(response, opts) { - showResult(response.responseText); - } - }); - } }); + + //simon-add + //如果申请科室配置了结算科室,那么采用此结算科室为默认值。 + //根据申请科室deptCoding 查找结算科室 + Ext4.Ajax.request({ + url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSupplyRoomConfigByCoding.do', + params : {'orgUnitCode':deptCoding,'type':3}, + timeout : 600000, + success : function(response, options) { + var result= Ext4.JSON.decode(response.responseText); + //simon-add:如果申请科室配置的默认结算科室不为空,那么设置此值为页面结算科室默认值 + if(!isUndefinedOrNullOrEmpty(result.settleAccountsDepart)&&!isUndefinedOrNullOrEmpty(result.settleAccountsDepartCoding)){ + top.Ext4.getCmp('settleAccountsDepart').setValue(result.settleAccountsDepart); + top.Ext4.getCmp('settleAccountsDepartCoding').setValue(result.settleAccountsDepartCoding); + } + }, + failure : function(response, opts) { + showResult(response.responseText); + } + }); DWREngine.setAsync(true); + } else { handleDepartStore.load({ callback: function(records, operation, success) {