Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js =================================================================== diff -u -r19456 -r21202 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 19456) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 21202) @@ -226,6 +226,10 @@ dataIndex : 'disable', renderer : disable },{ + header : "是否统计工作量", + width : 100, + dataIndex : 'isStatisticWorkLoad' + },{ header : "拼音码", width : 60, dataIndex : 'spelling' @@ -312,6 +316,9 @@ },{ type : 'string', dataIndex : 'disable' + },{ + type : 'string', + dataIndex : 'isStatisticWorkLoad' }] }); @@ -356,6 +363,8 @@ },{ name : 'disable' },{ + name : 'isStatisticWorkLoad' + },{ name : 'intoBasketMaxAmount' }]; Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.3_4.9.4.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.3_4.9.4.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.3_4.9.4.sql (revision 21202) @@ -0,0 +1 @@ +update MaterialDefinition set isStatisticWorkLoad='是'; Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r21088 -r21202 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 21088) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 21202) @@ -21,7 +21,7 @@ "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", - "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3"};// 版本列表 + "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js =================================================================== diff -u -r19366 -r21202 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js (.../materialDefinitionForm.js) (revision 19366) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js (.../materialDefinitionForm.js) (revision 21202) @@ -473,6 +473,28 @@ triggerAction : 'all', anchor : '100%' }] + }, { + columnWidth : .33, + layout : 'form', + items:[{ + xtype : 'combo', + fieldLabel : '是否统计工作量', + id : 'isStatisticWorkLoad', + name : 'isStatisticWorkLoad', + width : 130, + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore({ + fields : [ 'value' ], + data : [ ['是' ], ['否' ]] + }), + forceSelection : true, + allowBlank: true, + editable:false, + mode : 'local', + triggerAction : 'all', + anchor : '100%' + }] },{ columnWidth : .33, layout : 'form', @@ -577,6 +599,7 @@ foldersJsonStore.load(); top.Ext.getCmp('isTraceble').setValue('是'); top.Ext.getCmp('isMonthCheck').setValue('否'); + top.Ext.getCmp('isStatisticWorkLoad').setValue('是'); //添加时默认是否统计工作量为是 } function moveUpDown(v, p, record){