任务列表添加扣分项筛选条件

VisualInspection/js/mytask/task_list.js

@@ -38,7 +38,10 @@ function initQueryParams() {
         cur_status = page_params.status;
     }
     if(cur_status==4){
-        $("#dispatchPatchBtn").show();
+        $("#dispatchPatchBtn").show(); 
+    }
+
+    if(cur_status==4 || cur_status==5 || cur_status==6){
         $("#hasScoreDiv").show();       
     }
 }
@@ -70,7 +73,6 @@ function queryTask(){
     if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA)|| roleContains('STATION')) {
         hide = true;
     }
-    console.log("fffffff"+hide);
     var cols = [
                 {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                 {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},
@@ -171,9 +173,6 @@ function showTaskDetail(id){
 //下发所有任务
 function dispatchTaskPatch(){
      var param = {
-        // "start_time": $("#start_time").val(),
-        // "end_time": $("#end_time").val(),
-        // "checked_dept": $("#dept").val(),
         "check_status":4,
         "dispatch_ids":$('.datatable').mytable('getTableCheckedIds')
     }
@@ -187,19 +186,6 @@ function dispatchTaskPatch(){
     layer.confirm('确定下发选中任务？', {
         btn: ['确定','取消'] //按钮
     }, function(){
-        // var param = {
-        //     // "start_time": $("#start_time").val(),
-        //     // "end_time": $("#end_time").val(),
-        //     // "checked_dept": $("#dept").val(),
-        //     "check_status":4,
-        //     "dispatch_ids":$('.datatable').mytable('getTableCheckedIds')
-        // }
-        // if(param.dispatch_ids || param.dispatch_ids.length==0){
-        //     layer.msg('请选择下发任务！', {
-        //         time: 2000//20s后自动关闭
-        //     });
-        //     return;
-        // }
         no_return_common_service('/task/dispatch', param, function(data){
             queryTask();
             layer.msg(data, {

VisualInspection/view/mytask/taskDetail.html

@@ -166,6 +166,7 @@
                     {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                     {width: 60, text: '评分记录', type: 'string', flex: true, sort: 'down',field: 'content'},
                     {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
+                    {width: 80, text: '备注', type: 'string', flex: true, colClass: '',field: 'remark'},
                     {width: 200, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'}
                 ];
         if(hasRole(ROLE_JICHA) && ($.checkTask.check_status==2||$.checkTask.check_status==2||$.checkTask.check_status==12