Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r29712 -r29741 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 29712) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 29741) @@ -1817,13 +1817,13 @@ function setRecyclingApplicationForm(tempRecyclingApplication){ if(tempRecyclingApplication){ var recyclingApplication = Ext.util.JSON.decode(tempRecyclingApplication); - var deliverStatus = recyclingApplication.deliverStatus; var recyclingStatus = recyclingApplication.recyclingStatus; var committedStatus = recyclingApplication.committedStatus; var endStatus = recyclingApplication.endStatus; var printed = recyclingApplication.printed; var type = recyclingApplication.type; + var oldVersion = recyclingApplication.version; var isReaded = false; if(recyclingApplication.readed == 1){ isReaded = true; @@ -1887,7 +1887,7 @@ || type == reservateionApplicationForm){ comboApplication(recyclingApplication.id,recyclingApplication.departCoding,recyclingApplication.depart,hiddenCommitButton,hiddenSaveButton, hiddenReturnButton,type, '', specifyDisposableTypes,recyclingApplication.committedStatus, - recyclingApplication.handleDepartCoding,recyclingApplication); + recyclingApplication.handleDepartCoding,recyclingApplication,oldVersion); } }else{ showResult('加载出错,请联系统管理员!'); @@ -2282,7 +2282,7 @@ beforeload: function(s,options){ var beginTime = top.Ext.getCmp('beginTime').getValue(); if(!isUndefinedOrNullOrEmpty(beginTime)){ - var time = date2string(new Date(beginTime)) + var time = date2string(new Date(beginTime)); s.baseParams.startDate = time.split(' ')[0]; } }