js更新

js/customer/compensation/web/js/timepieceSchemeBillEx.js

@@ -83,13 +83,9 @@ shr.defineClass("shr.compensation.TimepieceSchemeBillEx", shr.compensation.Timep
 				// 确保key是fieldMap自身的属性，且不是booleanNum
 				if (fieldMap.hasOwnProperty(key) && key !== booleanNum) {
 					var checkField = fieldMap[key];
-					// 确保checkField存在且rowData中有该字段
-					if (checkField && rowData[checkField] !== undefined && boolVal.indexOf(checkField)!== -1 ) {
-						$entry.jqGrid('setCell', rowId, checkField, rowData[checkField], {
-							'background-color': cellColor
-						});
-					}
+
 					if(checkField && rowData[checkField] !== undefined && (rowData[checkField] == null || rowData[checkField] == "" ) ){ 
+						//点检率为空，黄色
 						$entry.jqGrid('setCell', rowId, checkField, rowData[checkField], {
 							'background-color': yellColor
 						});
@@ -97,6 +93,13 @@ shr.defineClass("shr.compensation.TimepieceSchemeBillEx", shr.compensation.Timep
 							errorRow += (i+1)+"," ;
 						}
 					}
+					// 确保checkField存在且rowData中有该字段  锁定的字段绿色
+					if (checkField && rowData[checkField] !== undefined && boolVal.indexOf(checkField)!== -1 ) {
+						$entry.jqGrid('setCell', rowId, checkField, rowData[checkField], {
+							'background-color': cellColor
+						});
+					}
+					
 				}
 			}
 		}
@@ -105,7 +108,7 @@ shr.defineClass("shr.compensation.TimepieceSchemeBillEx", shr.compensation.Timep
 		//去除errorRow最后一个“,”
 		  errorRow = errorRow.substring(0,errorRow.length-1);
 		  var  errorMsg =  "第"+ errorRow+ "行,点检率数据为空,请检查";
-		  shr.showWarning({message: errorMsg})
+		  shr.showWarning({message: errorMsg,  hideAfter: 6});
 	  }
 		$entry.jqGrid('hideCol', bFeild); // 隐藏列
   },