Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.js =================================================================== diff -u -r21843 -r21852 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.js (.../expensiveGoodsInvoiceView.js) (revision 21843) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.js (.../expensiveGoodsInvoiceView.js) (revision 21852) @@ -177,12 +177,14 @@ } Ext.onReady(function() { Ext.QuickTips.init(); - if(!isUndefinedOrNullOrEmpty(param_openMode)){ - openMode = param_openMode; - } + function renderCallModifyFunction(v, p, record){ return "" + v + ""; } + function render_date(v, p, record){ + alert(v) + return v; + } var departGroupStore = new Ext.data.SimpleStore({ fields : ['id', 'shift','departCode' ], url : WWWROOT + '/disinfectSystem/invoiceDepartmentAction!loadDepartGroup.do' @@ -219,11 +221,11 @@ ,{name : 'expensiveGoodsInvoicePlanId'} ,{name : 'serialNumber'} ,{name : 'remark'} - ,{name : 'applicationTime'} + ,{name : 'applicationTimeStr'} ] }) , sortInfo: { - field: 'urgency', + field: 'serialNumber', direction: 'DESC' // 'ASC'or 'DESC' } }), @@ -232,9 +234,9 @@ bodyStyle : 'border:1px solid #afd7af', sm : selectModel, cm : new top.Ext.grid.ColumnModel([selectModel, - {header : "流水号",width : 20,dataIndex : 'urgency', renderer : urgencyIconRender3}, - {header : "科室",width : 50,dataIndex : 'depart',menuDisabled:true,renderer : renderCallModifyFunction}, - {header : "申请时间",width : 20,dataIndex : 'urgency', renderer : urgencyIconRender3}, + {header : "流水号",width : 40,dataIndex : 'serialNumber',renderer : renderCallModifyFunction}, + {header : "科室",width : 80,dataIndex : 'depart',menuDisabled:true}, + {header : "申请时间",width : 40,dataIndex : 'applicationTimeStr',menuDisabled:true}, {id:'remark',header : "备注",width : 130,dataIndex : 'remark',menuDisabled:true} ]), autoExpandColumn : 'remark', Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpensiveGoodsInvoicePlanVo.java =================================================================== diff -u -r21842 -r21852 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpensiveGoodsInvoicePlanVo.java (.../ExpensiveGoodsInvoicePlanVo.java) (revision 21842) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpensiveGoodsInvoicePlanVo.java (.../ExpensiveGoodsInvoicePlanVo.java) (revision 21852) @@ -2,6 +2,9 @@ import java.util.Date; +import com.forgon.Constants; +import com.forgon.tools.util.ForgonDateUtils; + public class ExpensiveGoodsInvoicePlanVo { private String departCode; @@ -57,6 +60,9 @@ return applicationTime; } + public String getApplicationTimeStr() { + return ForgonDateUtils.safelyFormatDate(applicationTime, Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); + } public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; }