修改bug

WebUI/CallCenterWeb.UI/SystemManager/GroupClassManage.html

@@ -96,12 +96,12 @@
         var bl = false;
         $(document).ready(function () {
 
-            //var rl = $('#RoleCode', top.document).val();
-            //if (rl == "GLY") {
-            //    bl = true;
-            //    $(".zxarea").show();
-            //}
-            bl = true;
+            var rl = $('#RoleCode', top.document).val();
+            var gcode = $('#GroupCode', top.document).val();
+            if (rl == "GLY") {
+                bl = true;
+                //$(".zxarea").show();
+            }
             $(".zxarea").show();
 
             $.getJSON(huayi.config.callcenter_url + 'Class/GetClassList', {
@@ -113,32 +113,38 @@
                             + "' outtime='" + n.F_OutTime + "'>" + n.F_Name + "[" + n.F_InTime + "-" + n.F_OutTime + "]" + "</div>";
                         $("#external-events").append(html);
                     })
-                    $("#external-events div.external-event").each(function () {
-                        var d = { title: $.trim($(this).text()), classcode: $(this).attr("code"), intime: $(this).attr("intime"), outtime: $(this).attr("outtime") };
-                        $(this).data("eventObject", d);
-                        $(this).draggable({ zIndex: 999, revert: true, revertDuration: 0})
-                    });
+                    if (bl) {
+                        $("#external-events div.external-event").each(function () {
+                            var d = { title: $.trim($(this).text()), classcode: $(this).attr("code"), intime: $(this).attr("intime"), outtime: $(this).attr("outtime") };
+                            $(this).data("eventObject", d);
+                            $(this).draggable({ zIndex: 999, revert: true, revertDuration: 0 })
+                        });
+                    }
                 }
             });
             //获取班组列表
-            if (bl) {
-                $.getJSON(huayi.config.callcenter_url + 'Group/GetGroupList', { "token": $.cookie("token") }, function (result) {
-                    if (result.state.toLowerCase() == "success") {
-                        $(result.data).each(function (i, n) {
-                            var html = "<div class='group drag' code='" + n.F_GroupCode + "'>";
-                            html += "<div class='seatuser ' code='" + n.F_GroupCode + "'>" + n.F_GroupName + "</div>";
-                            $(n.Users).each(function (j, m) {
-                                html += "<span class='lable' code='" + m.F_UserCode + "'>" + m.F_UserName + "</span>";
-                            })
-                            html += '<div class="clearfix"></div></div>';
-                            $("#bzlist").append(html);
-                        })
-                        $(".seatuser").click(function (i, n) {
-                            $(".seatuser").removeClass("active");
-                            $(this).addClass("active");
-                            bind();
-                        })
 
+            $.getJSON(huayi.config.callcenter_url + 'Group/GetGroupList', { "token": $.cookie("token") }, function (result) {
+                if (result.state.toLowerCase() == "success") {
+                    var num = 0;
+                    $(result.data).each(function (i, n) {
+                        var html = "<div class='group drag' code='" + n.F_GroupCode + "'>";
+                        html += "<div class='seatuser ' code='" + n.F_GroupCode + "'>" + n.F_GroupName + "</div>";
+                        $(n.Users).each(function (j, m) {
+                            html += "<span class='lable' code='" + m.F_UserCode + "'>" + m.F_UserName + "</span>";
+                        })
+                        html += '<div class="clearfix"></div></div>';
+                        $("#bzlist").append(html);
+                        if (gcode == n.F_GroupCode) {
+                            num = i+1;
+                        }
+                    })
+                    $(".seatuser").click(function (i, n) {
+                        $(".seatuser").removeClass("active");
+                        $(this).addClass("active");
+                        bind();
+                    })
+                    if (bl) {
                         $(".group span.lable").each(function () {
                             var d = { code: $(this).attr("code"), name: $(this).text() };
                             $(this).data("eventObject", d);
@@ -166,17 +172,19 @@
                                 }
                             }
                         })
-                        $($(".seatuser")[0]).trigger("click");
                     }
-                });
-                $.getJSON(huayi.config.callcenter_url + 'GroupClass/GetNoGroupSeatList', { "token": $.cookie("token") }, function (result) {
-                    if (result.state.toLowerCase() == "success") {
-                        if (result.data.length > 0) {
-                            $(".wfz").show();
-                            $(result.data).each(function (i, n) {
-                                var html = "<span class='lable' style='display: inline;' code='" + n.F_UserCode + "'>" + n.F_UserName + "</span>";
-                                $("#zxlist").append(html);
-                            })
+                    $($(".seatuser")[num]).trigger("click");
+                }
+            });
+            $.getJSON(huayi.config.callcenter_url + 'GroupClass/GetNoGroupSeatList', { "token": $.cookie("token") }, function (result) {
+                if (result.state.toLowerCase() == "success") {
+                    if (result.data.length > 0) {
+                        $(".wfz").show();
+                        $(result.data).each(function (i, n) {
+                            var html = "<span class='lable' style='display: inline;' code='" + n.F_UserCode + "'>" + n.F_UserName + "</span>";
+                            $("#zxlist").append(html);
+                        })
+                        if (bl) {
                             $("#zxlist span.lable").each(function () {
                                 var d = { code: $(this).attr("code"), name: $(this).text() };
                                 $(this).data("eventObject", d);
@@ -186,12 +194,10 @@
                             });
                         }
                     }
-                });
-            }
-            else {
-                bind();
-            }
-        })
+                }
+            });
+
+        });
         function bind() {
             $('#calendar').html("");
             $('#calendar').fullCalendar({

WebUI/CallCenterWeb.UI/index.html

@@ -867,6 +867,7 @@
 									</span>
 								</a>
                                 <input id="RoleCode" type="hidden" />
+                                <input id="GroupCode" type="hidden" />
 							</div>
 							<div class="logo-element">
 							</div>

WebUI/CallCenterWeb.UI/js/main.js

@@ -582,6 +582,7 @@ $(document).ready(function() {
 		$('.ldtp-con').css("display", "none");
 		obj.Type = "SayFree";
 		Send();
+		Clean();
 	})
 	//顶部小头像
 	var little_pic = $('.head-pic .hp-box img').attr("src");
@@ -699,7 +700,8 @@ $(document).ready(function() {
 	}, function(result) {
 		if(result.state.toLowerCase() == "success") {
 			//console.log(result);
-			$("#RoleCode").val(result.data.user.F_RoleCode);
+		    $("#RoleCode").val(result.data.user.F_RoleCode);
+		    $("#GroupCode").val(result.data.user.F_GroupCode);
 			//console.log($("#RoleCode").val());
 			$(".username").text(result.data.user.F_UserName);
 			if(result.data.role) {