Merge remote-tracking branch 'origin/1.0.0_ruizmes_prod' into 1.0.0_ruizmes_prod

WebContent/app/util/RenderUtil.js

@@ -2805,6 +2805,7 @@ Ext.define('erp.util.RenderUtil', {
 	 * @Expression cellbgcolorYN:0:green:red:yellow 单元格内容 等于0整行显示绿色  大于0整行显示红色  小于0整行显示黄色
 	 */
 	cellbgcolorYN:function(val, meta, record, x, y, store, view){
+		debugger
 		var grid = view.ownerCt,me = grid.RenderUtil,column = grid.columns[y],field = column.dataIndex;
 		if(!me || !me.args){
 			meta.style = "background:#C6E2FF;";
@@ -2830,7 +2831,38 @@ Ext.define('erp.util.RenderUtil', {
 		}
 		return val;
 	},
-	
+
+	/**
+	 * 通用方法
+	 * 如果当前字段的值为某个值时，或者当前字段的值不为某个值时，改变该单元格所在行的背景颜色
+	 * @Expression cellbgcolorNew:0 单元格内容 等于0整行显示绿色  大于0整行显示红色  小于0整行显示黄色
+	 */
+	cellbgcolorNew:function(val, meta, record, x, y, store, view){
+		var grid = view.ownerCt,me = grid.RenderUtil,column = grid.columns[y],field = column.dataIndex;
+		if(!me || !me.args){
+			meta.style = "background:#C6E2FF;";
+			return val;
+		}
+		me.args.cellbgcolorNew = me.args.cellbgcolorNew || new Object();
+		var arg = me.args.cellbgcolorNew[field];
+		if(arg && (arg.length == 1)){
+			view.getRowClass = function(record, rowIndex, rowParams, store) {
+				if(record.get(field)==arg[0]){
+					return 'x-grid-row-green-special';
+				}else if (record.get(field)>arg[0]){
+					return 'x-grid-row-red-special';
+				}else {
+					return 'x-grid-row-yellow-special';
+				}
+			}
+		} else {
+			meta.style = "background:#C6E2FF;";
+		}
+		if(column.xtype == 'numbercolumn' && val != 0){
+			val = Ext.util.Format.number(val, column.format);
+		}
+		return val;
+	},
 	/**
 	 * 
 	 * 通用方法

WebContent/app/view/common/datalist/GridPanel.js

@@ -65,7 +65,7 @@ Ext.define('erp.view.common.datalist.GridPanel',{
 	initComponent : function(){
 		condition = this.BaseUtil.getUrlParam('urlcondition');
 		condition = (condition == null) ? "" : condition;
-		condition = condition.replace(/@@/,"'%").replace(/@@/,"%'");
+		condition = condition.replace(/@@/,"'%").replace(/@@/,"%'").replaceAll("$","'");
 		this.defaultCondition = this.defaultCondition?this.defaultCondition+condition:condition;//固定条件；从url里面获取
     	caller = this.caller || this.BaseUtil.getUrlParam('whoami');
     	if(this.autoQuery) {

WebContent/app/view/common/query/GridPanel.js

@@ -40,7 +40,7 @@ Ext.define('erp.view.common.query.GridPanel',{
 	initComponent : function(){
 		condition = this.BaseUtil.getUrlParam('urlcondition');
 		condition = (condition == null) ? "" : condition;
-		condition = condition.replace(/@/,"'%").replace(/@/,"%'");
+		condition = condition.replace(/@/,"'%").replace(/@/,"%'").replaceAll("$","'");
 		this.defaultCondition = condition;
 		var gridParam = {caller: this.caller || caller, condition: condition};
     	this.GridUtil.getGridColumnsAndStore(this, 'common/singleGridPanel.action', gridParam, "");

WebContent/jsps/v6/query.jsp

@@ -92,6 +92,15 @@
         {
             background-color:#F0E68C !important;
         }
+        .x-grid-row-red-special .x-grid-cell{
+            background-color:#FF0000 !important;
+        }
+        .x-grid-row-green-special .x-grid-cell{
+            background-color:#00FF00 !important;
+        }
+        .x-grid-row-yellow-special .x-grid-cell{
+            background-color:#FFFF00 !important;
+        }
     </style>
     <script type="text/javascript" src="<%=basePath %>resource/ext/6.6/ext-all-debug.js"></script>
     <script type="text/javascript" src="<%=basePath %>resource/i18n/i18n.js"></script>