Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r21589 -r23805 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 21589) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 23805) @@ -388,6 +388,9 @@ public String saveForeignTousseApplication() { JSONObject jsonObject = new JSONObject(); String foreignTousseInfo = StrutsParamUtils.getPraramValue("foreignTousseInfo", ""); + //simon-add handleDepart handleDepartCoding + String handleDepart= StrutsParamUtils.getPraramValue("handleDepart", ""); + String handleDepartCoding= StrutsParamUtils.getPraramValue("handleDepartCoding", ""); String actionType = StrutsParamUtils.getPraramValue("actionType", ""); jsonObject.put("success",true); jsonObject.put("message","保存成功!"); @@ -399,6 +402,9 @@ .setOperationTime(com.forgon.Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM .parse(operationTimeStr)); } + //simon-add + foreignTousseApplication.setHandleDepart(handleDepart); + foreignTousseApplication.setHandleDepartCoding(handleDepartCoding); foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseInfo, actionType); jsonObject.put("id", foreignTousseApplication.getId()); //供前台打印 jsonObject.put("applicationTime", ForgonDateUtils.safelyFormatDate(foreignTousseApplication.getApplicationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDD, "")); //供前台打印 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r23469 -r23805 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 23469) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 23805) @@ -249,10 +249,11 @@ application.setSerialNumber(serialNumManager .getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION)); } - application.setHandleDepart(systemParams - .getDptNameOfForeignTousse()); - application.setHandleDepartCoding(systemParams - .getDptCodeOfForeignTousse()); + //simon-delete +// application.setHandleDepart(systemParams +// .getDptNameOfForeignTousse()); +// application.setHandleDepartCoding(systemParams +// .getDptCodeOfForeignTousse()); application.setSequence(supplyRoomConfigManager .getOrgUnitSequence(application.getDepartCoding())); application.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE); Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r23799 -r23805 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23799) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23805) @@ -2,7 +2,7 @@ var foreignTousseForm; var foreignTousseApplyWindow; var applyDepartJsonStore; -var handleDepartStore; +var handleDepartmentStore; var settleDepartJsonStore; var supplierType = '外来器械租用商'; var supplierContacJsonStore; @@ -1475,7 +1475,7 @@ }); //simon-add:处理科室数据源 - handleDepartStore = new Ext4.data.JsonStore({ + handleDepartmentStore = new Ext4.data.JsonStore({ autoLoad: true, proxy : { type : 'ajax', @@ -1670,7 +1670,7 @@ minChars : 0, valueField : 'handleDepart', displayField : 'handleDepart', - store : handleDepartStore, + store : handleDepartmentStore, forceSelection : false, lazyInit : true, triggerAction : 'all',