Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14236 -r14251 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14236) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14251) @@ -688,6 +688,11 @@ orgunitCodes = AcegiHelper.getLoginUser() .getCurrentOrgUnitCode(); } + //判断是否需要重新加载模板,如果不为空,则根据对应的科室code来加载 + String reloadTemplate = StrutsParamUtils.getPraramValue("reloadTemplate", null); + if(reloadTemplate != null){ + orgunitCodes = reloadTemplate; + } SupplyRoomConfig config = supplyRoomConfigManager .getFirstSupplyRoomConfig(); // 是否一级供应室 Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r14245 -r14251 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14245) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14251) @@ -1561,35 +1561,36 @@ this.superclass.initComponent.call(this); } }); - - Ext4.Ajax.request({ - url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do', - params : { - applicationType : type, - id : id - }, - timeout : 600000,//default 30000 milliseconds - success : function(response, options) { - try { - var result = Ext4.JSON.decode(response.responseText); - leftTemplateStoreData = result.leftStore; - rightTemplateStoreData = result.rightStore; - - leftTemplateStore.proxy.data = result.leftStore; - leftTemplateStore.load(); - - rightTemplateStore.proxy.data = result.rightStore; - rightTemplateStore.load(); - - } catch (e) { - alert("Exception : "+ e); + /** + * 加载申请单物品 + * @param para 里面属性可以有applicationType,id,reloadTemplate + */ + function loadProduction(para) { + Ext4.Ajax.request({ + url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do', + params : para, + timeout : 600000,//default 30000 milliseconds + success : function(response, options) { + try { + var result = Ext4.JSON.decode(response.responseText); + leftTemplateStoreData = result.leftStore; + rightTemplateStoreData = result.rightStore; + leftTemplateStore.proxy.data = result.leftStore; + leftTemplateStore.load(); + rightTemplateStore.proxy.data = result.rightStore; + rightTemplateStore.load(); + } catch (e) { + alert("Exception : "+ e); + } + }, + failure : function(response, opts) { + showResult(response.responseText); } - }, - failure : function(response, opts) { - showResult(response.responseText); - } - }); + }); + } + + loadProduction({applicationType : type, id : id}); var form = new top.Ext4.form.Panel({ id : 'recyclingApplicationForm', @@ -1780,6 +1781,8 @@ var deptCoding = getDepartCoding(appDepartJsonStore,deptName); top.Ext4.ComponentQuery.query("#recyclingApplicationForm #departCoding")[0].setValue(deptCoding); setSettleAccountsDepartDefaultValue(deptName, deptCoding, departJsonStore); + //获取科室unitCode + var unitCode = record[0].data.id; //选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值 handleDepartStore.proxy.extraParams.applyDepartCode = deptCoding; @@ -1795,6 +1798,14 @@ comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = record.data.cssdOrgUnitCode; comboGoodsStore.reload(); + + //根据所选的科室重新加载模板 + var para2 = { + applicationType : type, + id : id, + reloadTemplate : unitCode + }; + loadProduction(para2); } } });