Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r29659 -r29683 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 29659) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 29683) @@ -910,8 +910,10 @@ targetNode.set('totalPrice', roundValue(price * count * para.transferScale)); } } - var panel = top.Ext4.getCmp(treegrid); - panel.getSelectionModel().select(targetNode, true); + if(top.Ext4.getCmp(treegrid)){ + var panel = top.Ext4.getCmp(treegrid); + panel.getSelectionModel().select(targetNode, true); + } } function addReturnDisposableGoodsByInvoicePlan(invoicePlanId){ @@ -3848,8 +3850,25 @@ tooltip : sstsConfig.packageName || '申请器械包', hidden : SSTS_PACKAGE_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.hideClinicalDepartmentApplyButton && !isSupplyRoomUser), handler : function() { - formPrinted = 1; - openApplication(tousseApplicationForm, '', ''); + if(sstsConfig.limitTousseApply){ + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/recyclingApplicationAction!limitTousseApply.do', + success: function(response, options) { + var result = Ext.decode(response.responseText); + if (result.success) { + formPrinted = 1; + openApplication(tousseApplicationForm, '', ''); + } else { + showResult(result.message); + var recyclingApplicationId = result.recyclingApplicationId; + RecyclingApplicationTableManager.getRecyclingApplicationAndVerifyEdit(recyclingApplicationId,setRecyclingApplicationForm); + } + } + }); + }else { + formPrinted = 1; + openApplication(tousseApplicationForm, '', ''); + } } },{ text : '申请一次性物品', @@ -3871,9 +3890,6 @@ var recyclingApplicationId = result.recyclingApplicationId; RecyclingApplicationTableManager.getRecyclingApplicationAndVerifyEdit(recyclingApplicationId,setRecyclingApplicationForm); } - }, - failure : function(response, options) { - showResult('获取服务器时间失败!'); } }); }else {