Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java =================================================================== diff -u -r19663 -r19695 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 19663) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 19695) @@ -97,23 +97,25 @@ */ public String isForeignTousseCanReturn(String id) { JSONObject obj = new JSONObject(); - boolean disableReturnStatus = true; - boolean disableAdvanceReturnStatus = false; + //是否禁用“确认归还”按钮 + boolean disableReturn = true; + //是否禁用“提前归还”按钮 + boolean disableEarlyReturn = false; if (DatabaseUtil.isPoIdValid(id)) { ForeignTousseApplication ftApplication = foreignTousseApplicationManager.getById(id); if (ftApplication != null && InvoicePlan.RECYCLINGSTATUS_RECYCLED.equals(ftApplication.getRecyclingStatus()) && !ForeignTousseApplication.APPLICATION_STATUS_RETRUN.equals(ftApplication.getPackageStatus())) { - disableReturnStatus = false; + disableReturn = false; } if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE.equals(ftApplication.getRecyclingStatus()) || ForeignTousseApplication.APPLICATION_STATUS_RETRUN.equals(ftApplication.getPackageStatus())){ - disableAdvanceReturnStatus = true; + disableEarlyReturn = true; } } - obj.put("disableReturnStatus", disableReturnStatus); - obj.put("disableAdvanceReturnStatus", disableAdvanceReturnStatus); + obj.put("disableReturn", disableReturn); + obj.put("disableEarlyReturn", disableEarlyReturn); return obj.toString(); } Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r19664 -r19695 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 19664) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 19695) @@ -914,15 +914,15 @@ includeImplantUsedAmountHidden = true; //是否禁用“确认归还”按钮 - var disableReturnStatus = true; + var disableReturn = true; //是否禁用“提前归还”按钮 - var disableAdvanceReturnStatus = true; + var disableEarlyReturn = true; if(id){ DWREngine.setAsync(false); ForeignTousseApplicationTableManager.isForeignTousseCanReturn(id,function(result){ var json = JSON.parse(result); - disableReturnStatus = json.disableReturnStatus; - disableAdvanceReturnStatus = json.disableAdvanceReturnStatus; + disableReturn = json.disableReturn; + disableEarlyReturn = json.disableEarlyReturn; }); DWREngine.setAsync(true); } @@ -960,7 +960,7 @@ },{ text : '确认归还', id : 'returnBtn', - disabled : disableReturnStatus, + disabled : disableReturn, handler : function(){ var tmpWindow = new top.Ext4.window.Window({ title : '请确认', @@ -992,7 +992,7 @@ } },{ text : '提前归还', - disabled:disableAdvanceReturnStatus, + disabled:disableEarlyReturn, handler : function(){ //由于Ext4.MessageBox.confirm兼容性问题,在全部申请单列表中点【是】按钮事件无反应,故而改用window显示 var tmpWindow = new top.Ext4.window.Window({