wenhongquan 8 rokov pred
rodič
commit
e4bd85f820

+ 14 - 2
VisualInspection/js/teamClass/charge_team_schedule.js

@@ -87,7 +87,10 @@
             get_common_service( "dept/getFsByDept","",function(data){
                 if(data != null){
                     $(".thread_charge").append("<th>"+data.name+"</th>");
+                    $(".thread_charge").append("<th>值班班长</th>");
+                    $(".thread_charge").append("<th>收费班长</th>");
                     $(".thread_charge").append("<th>值班室</th>");
+                    
                     // console.log(data);
                     lans = data.lanes_number;
                     entrance_number = data.entrance_numer ;
@@ -456,6 +459,9 @@
                             var ct = data[i].class_type ;
                             $(".tr-"+ct ).data("cache",data[i]);
                             $(".tr-"+ct).append("<td vertical-align='middle' align='center' style='width:100px;'><span style='font-weight:bold;'>"+ classCode[ct].class_name +"<br></span><span>"+classCode[ct].start_time+"</span> - <span>"+classCode[ct].end_time +"</span></td>");
+                           
+                          
+
                             var selectv = "<select class='form-control select-self' style='width:78px;'>"
                             selectv += ("<option value=''>请选择</option>");
                              selectv += ("<option value='0'>临时开道</option>");
@@ -463,8 +469,14 @@
                                     var obj = data[i].users[j];
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
-                            selectv += "</select> <i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self' style='float:right;margin-top:7px;'></i>";
+                            selectv += "</select>";
+              
+                            $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"_0' tag='0'>"+ selectv +"</td>")
+                            $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"_1' tag='0'>"+ selectv +"</td>")
+                         
+                            selectv += "<i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self' style='float:right;margin-top:7px;'></i>";
                             selectv += "<ul style='padding:0px;'></ul>"
+
                             $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv +"</td>")
                             for(var z=0;z<entrance_number;z++){
                                 $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
@@ -477,7 +489,7 @@
                         $(".tr-1").append("<td>"+ classCode["1"].class_name +" "+classCode["1"].start_time+" - "+classCode["1"].end_time +"</td>");
                         $(".tr-2").append("<td>"+ classCode[2].class_name +" "+classCode[2].start_time+" - "+classCode[2].end_time +"</td>");
                         $(".tr-3").append("<td>"+ classCode[3].class_name +" "+classCode[3].start_time+" - "+classCode[3].end_time +"</td>");
-                        for(var i=0;i<lans+1;i++){
+                        for(var i=0;i<lans+1+2;i++){
                              $(".tr-1,.tr-2,.tr-3").append("<td></td>");
                         }
                     }else{