chenrj-PC\chenrj 8 роки тому
батько
коміт
cded3f81d1

+ 5 - 1
VisualInspection/js/lib/mytable.js

@@ -180,7 +180,11 @@
                                 dArr.push(obj[cols[i].field]);
                                 dArr.push(obj[cols[i].field]);
                             }
                             }
                         } else {
                         } else {
-                            dArr.push('');
+                            if (cols[i].nullvalue != undefined){
+                                dArr.push(cols[i].nullvalue);
+                            }else{
+                                dArr.push('');
+                            }
                         }
                         }
                     }
                     }
 
 

+ 2 - 1
VisualInspection/js/statistics/personal_data_statistics.js

@@ -36,6 +36,7 @@ $(function(){
 	}
 	}
 
 
 	function queryAppeal(start_date,end_date,user_id){
 	function queryAppeal(start_date,end_date,user_id){
+
 		var data = {
 		var data = {
 			"start_date":start_date,
 			"start_date":start_date,
 				"end_date":end_date,
 				"end_date":end_date,
@@ -50,7 +51,7 @@ $(function(){
 		var cols = [
 		var cols = [
 					{width: 50, text: '序号', flex: true, colClass: 'text-center',field:'num'},
 					{width: 50, text: '序号', flex: true, colClass: 'text-center',field:'num'},
 					{width: 100, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
 					{width: 100, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
-					{width: 60, text: '扣分数',  flex: true, colClass: 'text-center',field:'score'},
+					{width: 60, text: '扣分数',  flex: true, colClass: 'text-center',field:'score',nullvalue:'0'},
 					{width: 100, text: '考核类型',  flex: true, colClass: 'text-center',sort: 'down',field:'parent_name'},
 					{width: 100, text: '考核类型',  flex: true, colClass: 'text-center',sort: 'down',field:'parent_name'},
 					{width: 100, text: '考核项',  flex: true, colClass: 'text-center',sort: 'down',field:'name'},
 					{width: 100, text: '考核项',  flex: true, colClass: 'text-center',sort: 'down',field:'name'},
 					{width: 100, text: '扣分凭证', type: 'imagedd', flex: true, hide:hide,field:'pics'},
 					{width: 100, text: '扣分凭证', type: 'imagedd', flex: true, hide:hide,field:'pics'},

+ 2 - 1
VisualInspection/view/statistics/personal_data_statistics.html

@@ -15,7 +15,8 @@
             <div class="div-start"><input class="form-control" placeholder="请选择考核开始时间"></input></div>
             <div class="div-start"><input class="form-control" placeholder="请选择考核开始时间"></input></div>
             <div class="div-to"><label  for="exampleInputAccount1">-</label></div>
             <div class="div-to"><label  for="exampleInputAccount1">-</label></div>
             <div class="div-end"><input class="form-control" placeholder="请选择考核结束时间"></input></div>
             <div class="div-end"><input class="form-control" placeholder="请选择考核结束时间"></input></div>
-            <div class="div-select"><select class="form-control" class="score-select">
+            <div class="div-select">
+                <select class="form-control score-select ">
                     <option value="">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
                     <option value="">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
                 </select>
                 </select>
             </div>
             </div>