Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.js =================================================================== diff -u -r17150 -r20440 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.js (.../departmentAppTemplateView.js) (revision 17150) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.js (.../departmentAppTemplateView.js) (revision 20440) @@ -88,8 +88,13 @@ width:240, dataIndex : 'operationTime', renderer:myDateFormatByMinute - } - ]; + },{ + id : 'sequence', + header : "序号", + width:100, + dataIndex : 'sequence' + }]; + var filters = new Ext.grid.GridFilters({ filters : [ {type:'string',dataIndex:'title'}, @@ -102,7 +107,8 @@ {name : 'id'}, {name : 'title'}, {name : 'operator'}, - {name : 'operationTime'} + {name : 'operationTime'}, + {name : 'sequence'} ]; var sign = true; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DepartmentAppTemplate.java =================================================================== diff -u -r12331 -r20440 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DepartmentAppTemplate.java (.../DepartmentAppTemplate.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DepartmentAppTemplate.java (.../DepartmentAppTemplate.java) (revision 20440) @@ -44,8 +44,12 @@ public static final String TEMPLATE_TYPE_TOUSSE1 = "治疗包模板"; public static final String TEMPLATE_TYPE_TOUSSE2 = "散件器械模板"; - public Integer sequence;//序号 + /** + * 序号 + */ + public Integer sequence; + @JsonIgnore private List tousseDefinitionTemplateItems = new ArrayList(); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js =================================================================== diff -u -r18491 -r20440 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 18491) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 20440) @@ -320,7 +320,7 @@ }] },{ layout : 'form', - columnWidth : .25, + columnWidth : .2, labelWidth : 50, items : [{ xtype : 'textfield', @@ -336,7 +336,7 @@ }] },{ layout : 'form', - columnWidth : .2, + columnWidth : .15, labelWidth : 50, items : [{ xtype : 'textfield', @@ -351,7 +351,7 @@ }] }, { layout : 'form', - columnWidth : 0.3, + columnWidth : .25, labelWidth : 60, items : [{ xtype : 'combo', @@ -369,6 +369,16 @@ triggerAction : 'all', anchor : '95%' }] + }, { + layout : 'form', + columnWidth : .15, + items : [{ + xtype : 'numberfield', + fieldLabel : '排序', + id : 'sequence', + name : 'sequence', + anchor : '95%' + }] }] },{ columnWidth : 1, @@ -457,7 +467,14 @@ top.Ext.getCmp('departName').setValue(""); top.Ext.getCmp('departName').setRawValue(""); } - },{ + }/*,{ + text:'查询', + handler : function() { + var departmentCode = top.Ext.getCmp('departName').getValue(); + var index = top.Ext.getCmp('configGrid').getStore().find('id', departmentCode); + top.Ext.getCmp('configGrid').getSelectionModel().selectRow(index); + } + }*/,{ text : '添加全部', iconCls : 'icon_systemset', handler : function() { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java =================================================================== diff -u -r20397 -r20440 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 20397) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 20440) @@ -112,7 +112,7 @@ @Override public List getDepartmentAppTemplates(String departmentCode) { if(StringUtils.isNotBlank(departmentCode)){ - String sql = " where po.orgUnitCode like '%" + departmentCode + "%'"; + String sql = " where po.orgUnitCode like '%" + departmentCode + "%' order by po.sequence"; List list = objectDao.findBySql(DepartmentAppTemplate.class.getSimpleName(), sql); if(list != null && list.size() > 0){ List returnList = new ArrayList();