Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r29118 -r29160 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 29118) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 29160) @@ -340,8 +340,6 @@ * @param autoReturnTheBorrowingTousse 是否自动归还借物 */ function submitRecyclingApplication(autoReturnTheBorrowingTousse){ - //console.log(rightTemplateStore.getRootNode()) - //console.log(JSON.parse(top.Ext4.getCmp('tousseInstanceInfos').getValue()));return form.form.submit({ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!saveRecyclingApplication.do', method : 'POST', @@ -353,9 +351,14 @@ waitMsg : '正在保存数据,请稍候', waitTitle : '提交表单', success : function(form, action) { + if(isCssdUser == 'true'){ + reloadGrid(); + }else { + reloadTimeField(); + } if(action.result.success == true){ applicationWindow.close(); - var msg = action.result.message; + var msg = action.result.message; if (msg.length <= 6){ showResult(action.result.message); if (flag == true){ @@ -369,9 +372,6 @@ icon: Ext4.Msg.INFO }); } - if (!isUndefinedOrNullOrEmpty(grid)){ - grid.dwrReload(); - } } }, failure : function(form, action) { Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r29159 -r29160 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 29159) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 29160) @@ -2266,7 +2266,7 @@ items : [ { columnWidth : 0.5, layout : 'form', - labelWidth:70, + labelWidth:65, items : [ { xtype : 'datefieldWithMin', fieldLabel : '开始时间', @@ -2281,7 +2281,7 @@ },{ columnWidth : 0.5, layout : 'form', - labelWidth:70, + labelWidth:65, items : [{ xtype : 'datefieldWithMin', fieldLabel : '结束时间', @@ -2320,7 +2320,7 @@ id : 'chooseRecyclingDetailWin', layout : 'fit', title : '打印一次性物品汇总单 ', - width : 600, + width : 530, border : false, modal : true, autoHeight : true, @@ -2427,11 +2427,9 @@ } - - function reloadTimeField(){ var startDate = Ext.getCmp("startDate").getValue(); - var endDate = Ext.getCmp("endDate").getValue(); + var endDate = Ext.getCmp("endDate").getValue(); if (isUndefinedOrNullOrEmpty(startDate) || isUndefinedOrNullOrEmpty(endDate)){ Ext.Msg.alert('警告', '时间不能为空!'); return; @@ -2441,12 +2439,28 @@ if (value1 > value2) { Ext.Msg.alert('警告', '开始时间不能大于结束时间!'); return; - } + } + document.getElementById('parm_s_startTime').value = value1; document.getElementById('parm_s_endTime').value = value2; grid.dwrReload(); } +function reloadGrid(){ + var value1 = document.getElementById('parm_s_startTime').value; + var value2 = document.getElementById('parm_s_endTime').value; + if(value1 == ''){ + value1 = Date.parse('2010-01-01 00:00:00'); + } + if(value2 == ''){ + value2 = Date.parse('2040-01-01 23:59:59'); + } + document.getElementById('parm_s_startTime').value = value1; + document.getElementById('parm_s_endTime').value = value2; + grid.dwrReload(); +} + + var searchTbar1 = []; //第1行过滤tbar var searchTbar1Width = 0; //第1行过滤tbar的宽度 var searchTbar2 = []; //第2行过滤tbar @@ -3868,7 +3882,7 @@ id : 'applyGrid', tbar : tbar, pageSize : 20, - defaultSortField : 'applicationTime desc,committedStatus asc,printed asc,orderByFiled', + defaultSortField : sortFieldStr, defaultSortDirection : 'DESC', searchDisableIndexes : ['invoiceStatus'], isCheckboxSelectionModel : true, @@ -4115,7 +4129,6 @@ } }); } - var viewport = new Ext.Viewport({ layout : 'border', items : [{