Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r33941 -r34132 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 33941) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 34132) @@ -3830,8 +3830,8 @@ {header : "最后修改时间",width : 120 * fontSizeScale,dataIndex : 'submitTime', renderer : myDateFormatByMinute}, {header : "打印时间",width : 120 * fontSizeScale,dataIndex : 'printTime', renderer : myDateFormatByMinute}, {header : "类型",width : 105 * fontSizeScale,dataIndex : 'type'}, - {header : "已提交",width : 46 * fontSizeScale,dataIndex : 'committedStatus', renderer : renderStatus}, - {header : "已打印",width : 46 * fontSizeScale,dataIndex : 'printed', renderer : renderPrintStatu}, + {header : "已提交",width : 60 * fontSizeScale,dataIndex : 'committedStatus', renderer : renderStatus}, + {header : "已打印",width : 60 * fontSizeScale,dataIndex : 'printed', renderer : renderPrintStatu}, {header : "汇总状态",width : 65 * fontSizeScale,dataIndex : 'gatherStatus',hidden : !sstsConfig.enableGatherRecyclingApplication, renderer : renderGatherStatusColor}, {header : "回收状态",width : 65 * fontSizeScale,dataIndex : 'recyclingStatus', renderer : renderColor2}, {header : "发货状态",width : 65 * fontSizeScale,dataIndex : 'deliverStatus', renderer : renderColor}, @@ -3962,7 +3962,6 @@ {name : 'returnedGoods'}, {name : 'handleDepartCoding'} ]; - var filters = new Ext.grid.GridFilters({ filters:[ {type: 'string', dataIndex: 'serialNumber'}, @@ -3972,7 +3971,7 @@ {type: 'date', dataIndex: 'printTime'}, {type: 'list', dataIndex: 'type', phpMode: true, options: applyFormTypeArr}, {type: 'string', dataIndex: 'readed'}, - {type: 'string', dataIndex: 'printed'}, + {type: 'list', dataIndex: 'printed', phpMode:true ,options:['部分打印','未打印','已打印']}, {type: 'list',dataIndex:'recyclingStatus', phpMode:true ,options:recyclingStatusArr}, {type: 'list', dataIndex: 'deliverStatus', phpMode:true ,options:statusArr}, {type: 'list', dataIndex: 'returnStatus', phpMode:true ,options:returnStatusArr}, @@ -3982,7 +3981,29 @@ {type: 'date', dataIndex: 'receiptingTime'}, {type: 'string', dataIndex: 'hospitalNumber'}, {type: 'string', dataIndex: 'remark'} - ] + ], + saveState:function(store, options){ + if(filters.getMenuFilter()){ + var active = filters.getMenuFilter().active; + var dataIndex = filters.getMenuFilter().dataIndex; + var value = filters.getMenuFilter().getValue(); + if(active == 'true' || active == true){ + if(dataIndex == 'printed'){ + var arr = []; + for(var i=0;i