排班管理

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -0,0 +1,237 @@
+  
+   $(document).ready(function() {
+
+        // 用户的dept_id
+        var user_dept_id = 12 ;
+        
+        // 收费小组type
+        var team_type = 1 ;
+
+        // 日期游标
+        var date_cursor = 0 ;
+
+        // var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+
+        $('#calendar').calendar();
+        var calendar = $('#calendar').data('zui.calendar');
+       
+        calendarInit();
+
+        // 请求稽查人员排班数据
+        function calendarInit(data_param){
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":getCurrentMonthFirst(),
+                "end_time":getCurrentMonthLast()
+            }
+            if(data_param != undefined){
+                data = data_param ;
+            }
+            getTeamClass(data,function(data){
+                var newEvents = [];
+                // console.log(data);
+                for(var i=0;i<data.length;i++){
+                    var obj = {id:data[i].id ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: timeStamp2String(data[i].start_time,"yyyy-MM-dd"), end: timeStamp2String(data[i].end_time,"yyyy-MM-dd")};
+                    newEvents.push(obj);
+                }
+                calendar.addEvents(newEvents);
+            })
+        }
+
+        // 获取排班信息
+        function getTeamClass(data,_function){
+            post_common_service( "teamClass/getClassList",data,function(data){
+               _function(data);
+            },function(error){
+                return "" ;
+            })
+        }
+
+        // 更新日历数据
+        function updateCalendar(data){
+            calendar.events = [];
+            calendar.display();
+            calendarInit(data);
+        }
+
+        // 当月第一天
+        function getCurrentMonthFirst(){
+            var date=new Date();
+            date.setDate(1);
+            return date.toLocaleDateString()+" 00:00:00";
+        }
+
+        // 当月最后一天
+        function getCurrentMonthLast(){
+            var date=new Date();
+            var currentMonth=date.getMonth();
+            var nextMonth=++currentMonth;
+            var nextMonthFirstDay=new Date(date.getFullYear(),nextMonth,1);
+            var oneDay=1000*60*60*24;
+            return new Date(nextMonthFirstDay-oneDay).toLocaleDateString()+" 00:00:00";
+        }
+
+        // 上一个月或者下个月的第一天或者最后一天
+        function getMonthByCondition(pre_or_after,first_or_last){
+            if(first_or_last == 'first'){
+                var date=new Date();
+                date.setDate(1);
+                date.setMonth(date.getMonth()+pre_or_after);
+                return date;
+            }else if(first_or_last == 'last'){
+                var date = new Date();
+                var currentMonth=date.getMonth();
+                var nextMonth=++currentMonth;
+                var nextMonthFirstDay=new Date(date.getFullYear(),nextMonth,1);
+                var oneDay=1000*60*60*24;
+                date = new Date(nextMonthFirstDay-oneDay);
+                date.setMonth(date.getMonth()+pre_or_after);
+                return date ;
+            }
+        }
+
+        $('#calendar').calendar().on("clickEvent.zui.calendar", function(event) {
+            // console.log(event);
+            click_function(event.event.start);
+        });
+
+        /**
+         * 点击日历触发函数
+         */
+        function click_function(date){
+            setAddTermTitle(date.format("yyyy-MM-dd"));
+            // 保存当前日期
+            $("#save_term_class").data("date",date.format("yyyy-MM-dd"));
+
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":date.format("yyyy-MM-dd 00:00:00"),
+                "end_time": date.format("yyyy-MM-dd 00:00:00")
+            }
+
+            getTeamClass(data,function(data){
+                for(var i=0;i<$("select[id*='_term']").length;i++){
+                    $("select[id*='_term']").eq(i).val("");
+                }
+                if(data.length > 0){
+                    $("#save_term_class").data("modify_flag",1);
+                    for(var i=0;i<data.length;i++){
+                        $(".class_team_"+data[i].class_type).val(data[i].team_id);
+                    }
+                }else{
+                     $("#save_term_class").data("modify_flag",0);
+                }
+                $('#myModal').modal();
+            })
+        }
+
+        $('#calendar').calendar().on("clickCell.zui.calendar", function(event) {
+            // console.log(event);
+            click_function(event.date);
+        });
+
+        // 下一个日期
+        $('#calendar').calendar().on("clickNextBtn.zui.calendar", function(event) {
+            // console.log(event);
+            date_cursor++ ;
+
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+            }
+            updateCalendar(data);
+        });
+
+        // 上一个日期
+        $('#calendar').calendar().on("clickPrevBtn.zui.calendar", function(event) {
+            date_cursor-- ;
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+            }
+            updateCalendar(data);
+        });
+
+        // 今天
+        $('#calendar').calendar().on("clickTodayBtn.zui.calendar", function(event) {
+            // console.log(event);
+            date_cursor = 0 ;
+            calendarInit();
+        });
+
+        $("#save_term_class").click(function(){
+            var data = [];
+            for(var i=0;i<$("select[id*='_term']").length;i++){
+                if($("select[id*='_term']").eq(i).val()!=""){
+                    var obj = {
+                        "class_type":i+1,
+                        "team_id":$("select[id*='_term']").eq(i).val(),
+                        "work_date": $("#save_term_class").data("date")+" 00:00:00",
+                        "start_time": $("#save_term_class").data("date")+" 00:00:00",
+                        "end_time": $("#save_term_class").data("date")+" 00:00:00",
+                        "dept_id":user_dept_id
+                    };
+                    data.push(obj);
+                }
+            }
+            if(data.length == 0 ){
+                tip("请增加排班!");
+                return ;
+            }
+            if( $("#save_term_class").data("modify_flag") != 1){
+                post_common_service("teamClass/add/list",data,function(data){
+                    updateCalendar();
+                    $('#myModal').modal('hide');
+                },function(error){
+                    $('#myModal').modal('hide');
+                })
+            }else{
+                post_common_service("teamClass/update/list",data,function(data){
+                    updateCalendar();
+                    $('#myModal').modal('hide');
+                },function(error){
+                    $('#myModal').modal('hide');
+                })
+            }
+        })
+
+        $("#close_btn").click(function(){
+            $('#myModal').modal('hide');
+        })
+
+        // 获取部门为1的班组信息
+        getTermClass(user_dept_id);
+
+        // 获取班组信息
+        function getTermClass(dept_id){
+            var data = {
+                'dept_id':dept_id ,
+                'type':team_type
+            }
+            post_common_service( "team/getTeamByDeptId/1/50",data,function(data){
+                for(var i=0;i<data.list.length;i++){
+                    $("#mooring_term,#middle_term,#night_term,#all_term").append("<option value='"+data.list[i].id+"'>"+data.list[i].name +"</option>")
+                }
+            },function(error){})
+        }
+
+   })
+
+   // 根据class_type 获取班次名称
+   function getTeamName(class_type){
+       if(class_type == 1){
+           return "早班";
+       }else if(class_type == 2){
+            return "中班";
+       }else if(class_type == 3){
+           return "晚班";
+       }else if(class_type == 4){
+           return "全班";
+       }
+   }
+
+   function setAddTermTitle(title){
+       $(".modal-title").html("添加班组-"+title);
+   }

VisualInspection/js/teamClass/check_team_schedule.js

@@ -1,49 +1,237 @@
-
     
    $(document).ready(function() {
 
+        // 用户的dept_id
+        var user_dept_id = 1 ;
+        
+        // 稽查小组type
+        var team_type = 2 ;
+
+        // 日期游标
+        var date_cursor = 0 ;
+
+        // var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
-        var newEvents =
-        [
-            {title: '考核二班-晚班',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '考核三班-晚班',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '考核四班-晚班',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '考核一班-休息',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '考核二班-晚班',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '考核三班-晚班',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '考核四班-晚班',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '考核一班-休息',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11 '},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11'},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11 '},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11 '},
-            {title: '未排班',  start: '2017-5-13 ', end: '2017-5-13 '},
-            {title: '未排班',  start: '2017-5-13 ', end: '2017-5-13'},
-            {title: '未排班',  start: '2017-5-13 ', end: '2017-5-13 '},
-           
-        ];
-        calendar.addEvents(newEvents);
+       
+        calendarInit();
 
         // 请求稽查人员排班数据
-      
-        var data = {
-            "dept_id":1 ,
-            "start_time":new Date(),
-            "end_time":new Date()
+        function calendarInit(data_param){
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":getCurrentMonthFirst(),
+                "end_time":getCurrentMonthLast()
+            }
+            if(data_param != undefined){
+                data = data_param ;
+            }
+            getTeamClass(data,function(data){
+                var newEvents = [];
+                // console.log(data);
+                for(var i=0;i<data.length;i++){
+                    var obj = {id:data[i].id ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: timeStamp2String(data[i].start_time,"yyyy-MM-dd"), end: timeStamp2String(data[i].end_time,"yyyy-MM-dd")};
+                    newEvents.push(obj);
+                }
+                calendar.addEvents(newEvents);
+            })
+        }
+
+        // 获取排班信息
+        function getTeamClass(data,_function){
+            post_common_service( "teamClass/getClassList",data,function(data){
+               _function(data);
+            },function(error){
+                return "" ;
+            })
+        }
+
+        // 更新日历数据
+        function updateCalendar(data){
+            calendar.events = [];
+            calendar.display();
+            calendarInit(data);
+        }
+
+        // 当月第一天
+        function getCurrentMonthFirst(){
+            var date=new Date();
+            date.setDate(1);
+            return date.toLocaleDateString()+" 00:00:00";
+        }
+
+        // 当月最后一天
+        function getCurrentMonthLast(){
+            var date=new Date();
+            var currentMonth=date.getMonth();
+            var nextMonth=++currentMonth;
+            var nextMonthFirstDay=new Date(date.getFullYear(),nextMonth,1);
+            var oneDay=1000*60*60*24;
+            return new Date(nextMonthFirstDay-oneDay).toLocaleDateString()+" 00:00:00";
+        }
+
+        // 上一个月或者下个月的第一天或者最后一天
+        function getMonthByCondition(pre_or_after,first_or_last){
+            if(first_or_last == 'first'){
+                var date=new Date();
+                date.setDate(1);
+                date.setMonth(date.getMonth()+pre_or_after);
+                return date;
+            }else if(first_or_last == 'last'){
+                var date = new Date();
+                var currentMonth=date.getMonth();
+                var nextMonth=++currentMonth;
+                var nextMonthFirstDay=new Date(date.getFullYear(),nextMonth,1);
+                var oneDay=1000*60*60*24;
+                date = new Date(nextMonthFirstDay-oneDay);
+                date.setMonth(date.getMonth()+pre_or_after);
+                return date ;
+            }
         }
-        post_common_service( "teamClass/getClassList",data,function(data){
-            console.log(data );
-        },function(error){})
 
         $('#calendar').calendar().on("clickEvent.zui.calendar", function(event) {
-            console.log(event.event);
-            // alert(event.event.title);
-            // console.log("你点击了一个事件");
-            // 处理 clickEvent 事件
-            // ...
-            // 对话框弹出
-            $('#myModal').modal();
+            // console.log(event);
+            click_function(event.event.start);
+        });
+
+        /**
+         * 点击日历触发函数
+         */
+        function click_function(date){
+            setAddTermTitle(date.format("yyyy-MM-dd"));
+            // 保存当前日期
+            $("#save_term_class").data("date",date.format("yyyy-MM-dd"));
+
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":date.format("yyyy-MM-dd 00:00:00"),
+                "end_time": date.format("yyyy-MM-dd 00:00:00")
+            }
+
+            getTeamClass(data,function(data){
+                for(var i=0;i<$("select[id*='_term']").length;i++){
+                    $("select[id*='_term']").eq(i).val("");
+                }
+                if(data.length > 0){
+                    $("#save_term_class").data("modify_flag",1);
+                    for(var i=0;i<data.length;i++){
+                        $(".class_team_"+data[i].class_type).val(data[i].team_id);
+                    }
+                }else{
+                     $("#save_term_class").data("modify_flag",0);
+                }
+                $('#myModal').modal();
+            })
+        }
+
+        $('#calendar').calendar().on("clickCell.zui.calendar", function(event) {
+            // console.log(event);
+            click_function(event.date);
         });
 
-   })
+        // 下一个日期
+        $('#calendar').calendar().on("clickNextBtn.zui.calendar", function(event) {
+            // console.log(event);
+            date_cursor++ ;
+
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+            }
+            updateCalendar(data);
+        });
+
+        // 上一个日期
+        $('#calendar').calendar().on("clickPrevBtn.zui.calendar", function(event) {
+            date_cursor-- ;
+            var data = {
+                "dept_id": user_dept_id ,
+                "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+            }
+            updateCalendar(data);
+        });
+
+        // 今天
+        $('#calendar').calendar().on("clickTodayBtn.zui.calendar", function(event) {
+            // console.log(event);
+            date_cursor = 0 ;
+            calendarInit();
+        });
+
+        $("#save_term_class").click(function(){
+            var data = [];
+            for(var i=0;i<$("select[id*='_term']").length;i++){
+                if($("select[id*='_term']").eq(i).val()!=""){
+                    var obj = {
+                        "class_type":i+1,
+                        "team_id":$("select[id*='_term']").eq(i).val(),
+                        "work_date": $("#save_term_class").data("date")+" 00:00:00",
+                        "start_time": $("#save_term_class").data("date")+" 00:00:00",
+                        "end_time": $("#save_term_class").data("date")+" 00:00:00",
+                        "dept_id":user_dept_id
+                    };
+                    data.push(obj);
+                }
+            }
+            if(data.length == 0 ){
+                tip("请增加排班!");
+                return ;
+            }
+            if( $("#save_term_class").data("modify_flag") != 1){
+                post_common_service("teamClass/add/list",data,function(data){
+                    updateCalendar();
+                    $('#myModal').modal('hide');
+                },function(error){
+                    $('#myModal').modal('hide');
+                })
+            }else{
+                post_common_service("teamClass/update/list",data,function(data){
+                    updateCalendar();
+                    $('#myModal').modal('hide');
+                },function(error){
+                    $('#myModal').modal('hide');
+                })
+            }
+        })
+
+        $("#close_btn").click(function(){
+            $('#myModal').modal('hide');
+        })
+
+        // 获取部门为1的班组信息
+        getTermClass(user_dept_id);
+
+        // 获取班组信息
+        function getTermClass(dept_id){
+            var data = {
+                'dept_id':dept_id ,
+                'type':team_type
+            }
+            post_common_service( "team/getTeamByDeptId/1/50",data,function(data){
+                for(var i=0;i<data.list.length;i++){
+                    $("#mooring_term,#middle_term,#night_term,#all_term").append("<option value='"+data.list[i].id+"'>"+data.list[i].name +"</option>")
+                }
+            },function(error){})
+        }
+
+   })
+
+   // 根据class_type 获取班次名称
+   function getTeamName(class_type){
+       if(class_type == 1){
+           return "早班";
+       }else if(class_type == 2){
+            return "中班";
+       }else if(class_type == 3){
+           return "晚班";
+       }else if(class_type == 4){
+           return "全班";
+       }
+   }
+
+   function setAddTermTitle(title){
+       $(".modal-title").html("添加班组-"+title);
+   }

VisualInspection/js/util/util.js

@@ -164,4 +164,51 @@ function addOrUpdateItem4Common(param,url,okCb){
 // ViewMap.set("/view/mytask/unexamined.html", __inline('/view/mytask/unexamined.html'));
 // ViewMap.set("/view/mytask/undispatched.html", __inline('/view/mytask/undispatched.html'));
 // ViewMap.set("/view/mytask/dispatched.html", __inline('/view/mytask/dispatched.html'));
-// ViewMap.set("/view/constant/constant.html", __inline('/view/constant/constant.html'));
+// ViewMap.set("/view/constant/constant.html", __inline('/view/constant/constant.html'));
+
+/**
+ * @Func 处理长整形时间格式化
+ * @time long
+ * @format string 有默认值
+ */
+function timeStamp2String(time,format){
+    if(time == "" || time == null)
+        return ;
+    if(format==undefined || format == "")
+        format = "yyyy/MM/dd hh:mm:ss";
+    var datetime = new Date();
+    datetime.setTime(time);
+    return datetime.Format(format);
+};
+
+/**
+ * @Func 时间格式化
+ * @FuncName Format
+ * (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 
+ */
+Date.prototype.Format = function (fmt) { 
+	 var o = {
+	     "M+": this.getMonth() + 1, 
+	     "d+": this.getDate(), 
+	     "h+": this.getHours(), 
+	     "m+": this.getMinutes(), 
+	     "s+": this.getSeconds(), 
+	     "q+": Math.floor((this.getMonth() + 3) / 3), 
+	     "S": this.getMilliseconds()
+	 };
+	 if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+	 for (var k in o)
+		 if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+	 return fmt;
+};
+
+/**
+ * 提示框
+ */
+function tip(data,timeout){
+    if(data==undefined || data=='')
+        return ;
+    layer.msg(data, {
+            time: (timeout!=null)?timeout:2000 //20s后自动关闭
+        });
+}

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -1,84 +1,78 @@
-
-                                <!--  start -->
-                                <div class="container-fluid ">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                               <div id="calendar" class="calendar"></div>
-                                            </div>
-                                        </div>
-                                </div>
-                                <!--   end -->          
-          
-            <!--对话框 开始-->
-            <div class="modal fade" id="myModal">
-                    <div class="modal-dialog">
-                        <div class="modal-content">
-                            
+    
+<!--  start -->
+<div class="container-fluid ">
+    <div class="row">
+        <div class="col-sm-12">
+            <div id="calendar" class="calendar"></div>
+        </div>
+    </div>
+</div>
+<!--   end -->         
+<!--对话框 开始-->
+<div class="modal fade" id="myModal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            
+        </div>
+        <div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+        <h4 class="modal-title">添加排班</h4>
+    </div>
+    <div class="modal-body">
+            <!-- 添加对话框 -->
+            <div class="container-fluid ">
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
+                        <div class="col-md-6 col-sm-8">
+                            <select id="mooring_term" type="text" class="form-control class_team_1" >
+                                <option value=''>请选择班组</option>
+                            </select>
                         </div>
-                        <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                        <h4 class="modal-title">添加排班-2017-03-05</h4>
                     </div>
-                    <div class="modal-body">
-                            <!-- 添加对话框 -->
-                            <div class="container-fluid ">
-                                <form class="form-horizontal">
-                                    <div class="form-group">
-                                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">收费一组</label>
-                                        <div class="col-md-6 col-sm-8">
-                                            <select type="text" class="form-control" >
-                                                <option>选择班次</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">收费二组</label>
-                                        <div class="col-md-6 col-sm-8">
-                                            <select type="text" class="form-control" >
-                                                <option>选择班次</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">收费三组</label>
-                                        <div class="col-md-6 col-sm-8">
-                                            <select type="text" class="form-control" >
-                                                <option>选择班次</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">收费四组</label>
-                                        <div class="col-md-6 col-sm-8">
-                                            <select type="text" class="form-control" >
-                                                <option>选择班次</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    
-                                    <hr>
-                                    
-                                    <div class="form-group">
-                                        <div class="col-sm-12">
-                                            <button type="submit" style="float:right;margin-right:3px;" class="btn btn-info">生成本月排班</button>
-                                            <button type="submit" style="float:right;margin-right:10px;" class="btn btn-info">生成今日排班</button>
-                                            <button type="submit" style="float:right;margin-right:10px;" class="btn btn">关闭</button>
-                                        </div>
-                                    </div>
-                                    </form>
-                            </div>
-                            <!--添加对话框结束-->
+                    <div class="form-group">
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">中班</label>
+                        <div class="col-md-6 col-sm-8">
+                            <select id="middle_term" type="text" class="form-control class_team_2" >
+                                <option value=''>请选择班组</option>
+                            </select>
+                        </div>
                     </div>
+                    <div class="form-group">
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">晚班</label>
+                        <div class="col-md-6 col-sm-8">
+                            <select id="night_term" type="text" class="form-control class_team_3" >
+                                <option value=''>请选择班组</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
+                        <div class="col-md-6 col-sm-8">
+                            <select id="all_term" type="text" class="form-control class_team_4" >
+                                <option value=''>请选择班组</option>
+                            </select>
+                        </div>
+                    </div>
+                    <hr>
+                    <div class="form-group">
+                        <div class="col-sm-12">
+                            <button  style="float:right;margin-right:10px;" id="close_btn" class="btn btn">关闭</button>
+                            <button type="submit" style="float:right;margin-right:10px;" id="save_term_class" class="btn btn-info">生成今日排班</button>
+                        </div>
                     </div>
                 </div>
             </div>
-            <!--对话框 结束-->
-        </div>
-        <!-- e-->
-
-    <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
-    <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css"> 
+            <!--添加对话框结束-->
+    </div>
+    </div>
+</div>
+</div>
+<!--对话框 结束-->
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
+<script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
+<script src="/js/teamClass/charge_team_schedule.js"></script>
 
 <style type="text/css" >
     span.time{
@@ -88,43 +82,3 @@
         text-align: center ;
     }
 </style>
-<script type="text/javascript">
-    
-   $(document).ready(function() {
-          $('#calendar').calendar();
-
-         var calendar = $('#calendar').data('zui.calendar');
-        var newEvents =
-        [
-            {title: '收费二班-晚班',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '收费三班-晚班',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '收费四班-晚班',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '收费一班-休息',  start: '2017-5-1 ', end: '2017-5-1 '},
-            {title: '收费二班-晚班',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '收费三班-晚班',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '收费四班-晚班',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '收费一班-休息',  start: '2017-5-12 ', end: '2017-5-12 '},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11 '},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11'},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11 '},
-            {title: '未排班',  start: '2017-5-11 ', end: '2017-5-11 '},
-            {title: '未排班',  start: '2017-5-13 ', end: '2017-5-13 '},
-            {title: '未排班',  start: '2017-5-13 ', end: '2017-5-13'},
-            {title: '未排班',  start: '2017-5-13 ', end: '2017-5-13 '},
-            {title: '未排班',  start: '2017-5-13 ', end: '2017-5-13 '},
-        ];
-        calendar.addEvents(newEvents);
-
-        $('#calendar').calendar().on("clickEvent.zui.calendar", function(event) {
-            console.log(event.event);
-            // alert(event.event.title);
-            // console.log("你点击了一个事件");
-            // 处理 clickEvent 事件
-            // ...
-            // 对话框弹出
-            $('#myModal').modal();
-        });
-
-   })
-
-</script>

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -17,55 +17,52 @@
         <div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-        <h4 class="modal-title">添加排班-2017-03-05</h4>
+        <h4 class="modal-title">添加排班</h4>
     </div>
     <div class="modal-body">
             <!-- 添加对话框 -->
             <div class="container-fluid ">
-                <form class="form-horizontal">
+                <div class="form-horizontal">
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">考核一组</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
                         <div class="col-md-6 col-sm-8">
-                            <select type="text" class="form-control" >
-                                <option>选择班次</option>
+                            <select id="mooring_term" type="text" class="form-control class_team_1" >
+                                <option value=''>请选择班组</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">考核二组</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">中班</label>
                         <div class="col-md-6 col-sm-8">
-                            <select type="text" class="form-control" >
-                                <option>选择班次</option>
+                            <select id="middle_term" type="text" class="form-control class_team_2" >
+                                <option value=''>请选择班组</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">考核三组</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">晚班</label>
                         <div class="col-md-6 col-sm-8">
-                            <select type="text" class="form-control" >
-                                <option>选择班次</option>
+                            <select id="night_term" type="text" class="form-control class_team_3" >
+                                <option value=''>请选择班组</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">考核四组</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
                         <div class="col-md-6 col-sm-8">
-                            <select type="text" class="form-control" >
-                                <option>选择班次</option>
+                            <select id="all_term" type="text" class="form-control class_team_4" >
+                                <option value=''>请选择班组</option>
                             </select>
                         </div>
                     </div>
-                    
                     <hr>
-                    
                     <div class="form-group">
                         <div class="col-sm-12">
-                            <button type="submit" style="float:right;margin-right:3px;" class="btn btn-info">生成本月排班</button>
-                            <button type="submit" style="float:right;margin-right:10px;" class="btn btn-info">生成今日排班</button>
-                            <button type="submit" style="float:right;margin-right:10px;" class="btn btn">关闭</button>
+                            <button  style="float:right;margin-right:10px;" id="close_btn" class="btn btn">关闭</button>
+                            <button type="submit" style="float:right;margin-right:10px;" id="save_term_class" class="btn btn-info">生成今日排班</button>
                         </div>
                     </div>
-                    </form>
+                </div>
             </div>
             <!--添加对话框结束-->
     </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamClassController.java

@@ -39,6 +39,17 @@ public class TeamClassController extends BaseController {
     }
     
     /**
+     * 添加班次 list
+     */
+    @RequestMapping(value = "/add/list")
+    public String addList(@Valid @RequestBody List<TeamClass> teamClasses){
+    	for(int i=0;i<teamClasses.size();i++ ){
+    		teamClassService.insert(teamClasses.get(i));    		
+    	}
+    	return super.returnSuccessResult("添加成功");
+    }
+    
+    /**
      * 修改班次
      * @return
      * String
@@ -52,6 +63,19 @@ public class TeamClassController extends BaseController {
     }
     
     /**
+     * 更新班次
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/update/list")
+    public String update(@Valid @RequestBody List<TeamClass> teamClasses){
+    	teamClassService.updateList(teamClasses);
+    	return super.returnSuccessResult("修改成功");
+    }
+    
+    /**
      * 删除班次
      * @return
      * String

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/TeamClassDao.java

@@ -17,4 +17,5 @@ public interface TeamClassDao  {
     public void insert(TeamClass teamClass);
     public void update(TeamClass teamClass);
     public void delete(Long id);
+    public void deleteByDeptWorkdate(TeamClass teamClass);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/TeamClassMapper.xml

@@ -31,6 +31,7 @@
         <if test="dept_id != null">AND t.dept_id = #{dept_id}</if>
         <if test="start_time != null">AND t.work_date &gt;= #{start_time}</if>
         <if test="end_time != null">AND t.work_date &lt;= #{end_time}</if>
+        ORDER BY t.work_date ASC ,t.class_type ASC
     </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.TeamClass" >
@@ -62,4 +63,12 @@
         WHERE
         id =#{id}
     </delete>
+    
+    <delete id="deleteByDeptWorkdate" parameterType="com.xintong.visualinspection.bean.TeamClass" >
+        DELETE FROM
+        sys_team_class
+        WHERE
+        work_date =#{work_date} and dept_id=#{dept_id}
+    </delete>
+    
 </mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamClassService.java

@@ -23,4 +23,5 @@ public interface TeamClassService {
     public void insert(TeamClass teamClass);
     public void update(TeamClass teamClass);
     public void delete(Long id);
+    public void updateList(List<TeamClass> teamClasses);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/TeamClassServiceImpl.java

@@ -52,11 +52,21 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 		teamClassDao.update(teamClass);
 	}
 
+	@Override
+	public void updateList(List<TeamClass> teamClasses) {
+		// 先删除原来的数据，再添加
+		if(teamClasses.size()>0){
+			teamClassDao.deleteByDeptWorkdate(teamClasses.get(0));
+			
+			for(int i =0;i<teamClasses.size();i++){
+				teamClassDao.insert(teamClasses.get(i));
+			}			
+		}
+	}
 
 	@Override
 	public void delete(Long id) {
 		// TODO Auto-generated method stub
 		teamClassDao.delete(id);
 	}
-
 }