任务显示

VisualInspection/js/statistics/assess_ranking.js

@@ -135,9 +135,9 @@ function addTask(userid, start_date, end_date) {
         var tasklist = data.teamClasseList;
         var userclasslist = data.userClassCountList;
 
-        var allheight = 500;
-        var height = allheight - 150 - 20;
-        var allwidth = 820;
+        var allheight = 600;
+        var height = allheight - 150 - 45;
+        var allwidth = 920;
 
 
         //计算日期
@@ -268,15 +268,24 @@ function addTask(userid, start_date, end_date) {
                 for(var j=0;j<arry.length;j++){
                     var hasin = false;
                     var usercounttemp = arry[j];
+                    var taskfail = false;
 
                     if(teamclassarry!=null){
                         var d = hasinList(usercounttemp,teamclassarry)
                         hasin = d!=null
+                        if(hasin){
+                            if(d.check_status == 22){
+                                taskfail = true;
+                            }
+                        }
                     }
                     var classname = "btn-warning disabled";
                     if(hasin){
                        continue;
                     }
+                    if(taskfail){
+                        classname = "btn-important disabled";
+                    }
 
                     
                     var name = (new Date(usercounttemp.start_time)).Format("HH:mm") + "--"+(new Date(usercounttemp.end_time)).Format("HH:mm")
@@ -363,7 +372,8 @@ function addTask(userid, start_date, end_date) {
                    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#3280FC"/><div class="col-xs-10">排班未被稽查</div></div>'+
                    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#F1A325"/><div class="col-xs-10">已稽查但排班被删除</div></div>'+
                    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#EA644A"/><div class="col-xs-10">排班未满15分钟</div></div>'+
-                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#03B8CF"/><div class="col-xs-10">排班已稽查但任务无效</div></div>';
+                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#03B8CF"/><div class="col-xs-10">排班已稽查但任务无效</div></div>'+
+                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#BD7B46"/><div class="col-xs-10">已稽查但任务无效且排班已删除</div></div>';
 
         
         var selectdiv = '<div class="row" style="text-align: left;"><div class="col-xs-10">已选择的排班：</div></div>'+
@@ -378,7 +388,7 @@ function addTask(userid, start_date, end_date) {
         }
         
         var html = css + '<div class="row row_alert" style="padding-left:10px;padding-right:10px;">' + table1 + '</div><div class="row row_alert" style="bottom: 0;position: absolute;width: 100%;text-align: right;}">' +
-            '<div class="col-xs-3">'+tips+'</div><div class="col-xs-3">'+selectdiv+'</div><div class="col-xs-3"><span class="selecttag" style="text-align: right;">请分配对应的稽查人员：</span></div><div class="col-xs-3  class="selecttag""><select data-placeholder="选择稽查员" id="selectusers" class="chosen-select form-control" >' +
+            '<div class="col-xs-4">'+tips+'</div><div class="col-xs-3">'+selectdiv+'</div><div class="col-xs-3"><span class="selecttag" style="text-align: right;">请分配对应的稽查人员：</span></div><div class="col-xs-2  class="selecttag""><select data-placeholder="选择稽查员" id="selectusers" class="chosen-select form-control" >' +
             optlist+
             '</select></div><div class="row row_alert"><button class="btn btn-primary" style="margin:20px;margin-right:10px" onclick="creatTask()" type="button">生成任务</button></div></div>';