Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r19532 -r19534 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 19532) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 19534) @@ -62,7 +62,7 @@ //设置打开表单的对象 setOpenFormObj(tousseType, form); if (!isUndefinedOrNullOrEmpty(form)){ - comboApplication(0, "true",false,false,true,form, false); + comboApplication(0, "true",false,false,true,form, false, ''); } } @@ -1718,9 +1718,9 @@ var status = recyclingApplication.status; var type = recyclingApplication.type; if(type == comboApplicationForm || type == recyclingCreateApplicationForm){ - comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus); + comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding); }else if(type == tousseApplicationForm || type == diposableGoodsApplicationForm || type == disinfectGoodsApplicationForm){ - comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus); + comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding); } //设置“申请单id”、“流水号”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“项目”10个属性 Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r19532 -r19534 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 19532) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 19534) @@ -8,8 +8,9 @@ * @param hiddenReturnEditButton 是否隐藏返回修改按钮 * @param type 申请单类型 * @param originalCommittedStatus 申请单状态 + * @param handleDepartCoding 处理科室的科室编码(修改才有值) */ -function comboApplication(id,editable,hiddenCommitButton,hiddenSaveButton,hiddenReturnEditButton,type,originalCommittedStatus) { +function comboApplication(id,editable,hiddenCommitButton,hiddenSaveButton,hiddenReturnEditButton,type,originalCommittedStatus,handleDepartCoding) { //登录用是否供应室用户 var isSupplyRoomUser = validateIsSupplyRoomUser(); //登录用户的当前科室编码 @@ -1339,7 +1340,8 @@ * @param loadExistGoods 是否需要加载已申领的物品 */ function loadProduction(para, loadExistGoods) { - para.handleDepartCoding = top.Ext4.getCmp('handleDepartCoding').getValue(); //增加处理科室的参数 + var tempHandleDepartCoding = top.Ext4.getCmp('handleDepartCoding').getValue() + para.handleDepartCoding = tempHandleDepartCoding ? tempHandleDepartCoding : handleDepartCoding; //增加处理科室的参数 Ext4.Ajax.request({ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do', params : para,