bug 修改

VisualInspection/js/appeal_management/appeal_checked.js

@@ -1,9 +1,13 @@
 // var page_size=10;
 function queryCheckedAppealTask(){
+    var start_time = "";
+    if($("#start_time").val()) start_time = $("#start_time").val()+" 00:00:00";
+    var end_time = "";
+    if($("#end_time").val()) end_time = $("#end_time").val()+" 23:59:59"; 
     var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "dept": $("#dept").val(),
+        "start_time": start_time,
+        "end_time": end_time,
+        "checked_dept": $("#fsList").val(),
         "status_search_type":1,
         "check_status":14
     }

VisualInspection/js/appeal_management/appeal_list.js

@@ -6,7 +6,7 @@ function initAppealPage() {
 }
 function initQueryParams() {
     // 仅选择日期
-    $("#start-time").datetimepicker(
+    $("#start_time").datetimepicker(
     {
         language:  "zh-CN",
         weekStart: 1,
@@ -19,7 +19,7 @@ function initQueryParams() {
         format: "yyyy-mm-dd"
     });
     // 仅选择日期
-    $("#end-time").datetimepicker(
+    $("#end_time").datetimepicker(
     {
         language:  "zh-CN",
         weekStart: 1,
@@ -31,7 +31,7 @@ function initQueryParams() {
         forceParse: 0,
         format: "yyyy-mm-dd"
     });
-    setFeSelect("#dept_select");
+    setFeSelect("#fsList");
     //获取页面参数
     var page_params = $.zui.store.get("page_params");
     if(page_params && page_params.status) {
@@ -55,10 +55,14 @@ function initAppealList() {
 }
 
 function queryAppeal(){
+    var start_time = "";
+    if($("#start_time").val()) start_time = $("#start_time").val()+" 00:00:00";
+    var end_time = "";
+    if($("#end_time").val()) end_time = $("#end_time").val()+" 23:59:59"; 
     var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#dept_select").val(),
+        "start_time": start_time,
+        "end_time": end_time,
+        "checked_dept":  $("#fsList").val(),
         "check_status": cur_status,
     }
     var hide = false;

VisualInspection/js/appeal_management/appeal_submited.js

@@ -1,9 +1,13 @@
 // var page_size=10;
 function querySubmitedAppealTask(){
+    var start_time = "";
+    if($("#start_time").val()) start_time = $("#start_time").val()+" 00:00:00";
+    var end_time = "";
+    if($("#end_time").val()) end_time = $("#end_time").val()+" 23:59:59"; 
     var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "dept": $("#dept").val(),
+        "start_time": start_time,
+        "end_time": end_time,
+        "checked_dept":  $("#fsList").val(),
         "status_search_type":2,
         "check_status":11,
         "check_status_end":14

VisualInspection/js/mytask/apply_task.js

@@ -1,7 +1,7 @@
 
     function initApplyPage(){
         // 仅选择日期
-        $("#start-time").datetimepicker(
+        $("#start_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,
@@ -14,7 +14,7 @@
             format: "yyyy-mm-dd"
         });
         // 仅选择日期
-        $("#end-time").datetimepicker(
+        $("#end_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,
@@ -45,9 +45,13 @@ function initTableRowBtn() {
 
 function queryUnexaminedTask(){
     initTableRowBtn();
+    var start_time = "";
+    if($("#start_time").val()) start_time = $("#start_time").val()+" 00:00:00";
+    var end_time = "";
+    if($("#end_time").val()) end_time = $("#end_time").val()+" 23:59:59"; 
     var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
+        "start_time": start_time,
+        "end_time": end_time,
         "checked_dept": $("#fsList").val(),
         "check_status":cur_status
     }
@@ -104,6 +108,10 @@ function showApplyDetail1(id){
     var param = {
         'id':id
     };
+    $('#apply_man').val("");
+    $('#apply_time').val("");
+    $('#apply_reason').val("");
+    $('#apply_id').val("");   
     post_common_service('/checkApply/getByTaskId', param, function(data) {
         $('#apply_man').val(data.apply_man_name);
         $('#apply_time').val(data.apply_time);
@@ -136,6 +144,10 @@ function showApplyDetail(id){
     var param = {
         'id':id
     };
+    $('#apply_man').val("");
+    $('#apply_time').val("");
+    $('#apply_reason').val("");
+    $('#apply_id').val("");  
     post_common_service('/checkApply/getByTaskId', param, function(data) {
         $('#apply_man').val(data.apply_man_name);
         $('#apply_time').val(data.apply_time);

VisualInspection/js/mytask/check.js

@@ -1,5 +1,5 @@
 function initCheck() {
-    $('#ex1').slider();
+    $('#ex1').slider({tooltip: 'hide'});
     $("#ex1").on("slideStop", function(slideEvt) {
         setVideoProcess(slideEvt.value);
     });
@@ -39,12 +39,14 @@ function initCheck() {
     if ($.checkTask) {
         initCheckAppealBtns();
         setFeSelect("#fsList", $.checkTask.checked_dept);
-        setLaneSelect("#lane", $.checkTask.checked_location);
+        console.log("ddddddddd"+$.checkTask);
+        $("#lane").val($.checkTask.checked_location);
+        // setLaneSelect("#lane", $.checkTask.checked_location);
         get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function (data) {
             changePersonContent(data);
         })
         //查询评分情况
-        queryScores();
+        queryCheckScores();
         //查询录像播放列表
         queryVideoList();
     }
@@ -71,12 +73,13 @@ function initCheckAppealBtns(){
     }
 }
 // 使用data参数更新数据：
-function queryScores() {
+function queryCheckScores() {
     //$('#score_datatable').score_datatable("");
     console.log("任务id："+$.checkTask.id);
     var data = {
         "task_id": $.checkTask.id
     }
+    // alert("ff");
     var cols = [
         { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
         { width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down', field: 'content' },
@@ -85,8 +88,8 @@ function queryScores() {
         {
             width: 160, text: '操作', type: 'string', flex: true, field: 'id',
             oper: [
-                { func: 'showEditScore', text: '修改', icon_class: 'icon-edit' },
-                { func: 'deleteScore', text: '删除', icon_class: 'icon-remove-circle' }
+                { func: 'showEditCheckScore', text: '修改', icon_class: 'icon-edit' },
+                { func: 'deleteCheckScore', text: '删除', icon_class: 'icon-remove-circle' }
             ]
         }
     ];
@@ -101,8 +104,8 @@ function queryScores() {
     }
     );
 }
-function showEditScore(id) {
-    // deleteItem4Common(id,"/score/delete/",queryScores);
+function showEditCheckScore(id) {
+    // deleteItem4Common(id,"/score/delete/",queryCheckScores);
     var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
     // scoreDetailLayer = showPopup4Common('修改考核项',null,['600px','500px'],'#score-detail-div');
     // var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
@@ -131,7 +134,7 @@ function saveEdit(){
         no_return_common_service("/score/update", param, function (data) {
             if (scoreLayer) layer.close(scoreLayer);
             //查询评分情况
-            queryScores();
+            queryCheckScores();
             layer.msg(data, {
                 time: 2000//20s后自动关闭
             });
@@ -139,8 +142,8 @@ function saveEdit(){
     }
 }
 
-function deleteScore(id) {
-    deleteItem4Common(id, "/score/delete/", queryScores, 'r');
+function deleteCheckScore(id) {
+    deleteItem4Common(id, "/score/delete/", queryCheckScores, 'r');
 }
 
 function setVideoList(videos){
@@ -196,7 +199,7 @@ function genPicstr(src){
     if(ISCLIENT) {
         pic = '<div class="img_item" style="width:100px;height:90px;float:left;">'
                 + '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
-                + '<a class="card lightbox-toggle" onclick="'+src +'" href="javascript:void(0)" style="position:absolute">'
+                + '<a class="card" onclick="'+src +'" href="javascript:void(0)" style="position:absolute">'
                 + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + src + '" alt="">'
                 + '</a>'
                 + '</div>';
@@ -223,7 +226,7 @@ function showChangeUser() {
         var userStr = "";
         for (var i in data) {
             var name = data[i].truename;
-            if (data[i].workno) name = name+" "+data[i].workno;
+            if (data[i].workno) name = name+" "+data[i].workno.substr(data[i].workno.length-3);
             var pic = "../../images/body-bg.png";
             if (data[i].pic) pic = base_image_server_url+data[i].pic;
             str = '<div style="width:100px;float:left;margin:5px;">'
@@ -268,6 +271,7 @@ function changePersonContent(data) {
     $("#person_img > img").attr("src", imgSrc);
     if(ISCLIENT) {
         $("#person_img").attr("href", "javascript:void(0)");
+        $("#person_img").removeClass("lightbox-toggle");
         $("#person_img").click(function(){
             showClientImg(imgSrc);
         });
@@ -418,7 +422,7 @@ function zTreeOnClick(event, treeId, treeNode) {
         if (scoreLayer) layer.close(scoreLayer);
         clearAllImg();
         //查询评分情况
-        queryScores();
+        queryCheckScores();
         layer.msg(data, {
             time: 2000//20s后自动关闭
         });

VisualInspection/js/mytask/checked.js

@@ -1,9 +1,13 @@
 // var page_size=10;
 function queryCheckedTask(){
+    var start_time = "";
+    if($("#start_time").val()) start_time = $("#start_time").val()+" 00:00:00";
+    var end_time = "";
+    if($("#end_time").val()) end_time = $("#end_time").val()+" 23:59:59"; 
     var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "dept": $("#dept").val(),
+        "start_time": start_time,
+        "end_time": end_time,
+        "checked_dept": $("#fsList").val(),
         "status_search_type":1,
         "check_status":4
     }

VisualInspection/js/mytask/task_list.js

@@ -6,7 +6,7 @@ function initTaskPage() {
 }
 function initQueryParams() {
     // 仅选择日期
-    $("#start-time").datetimepicker(
+    $("#start_time").datetimepicker(
     {
         language:  "zh-CN",
         weekStart: 1,
@@ -19,7 +19,7 @@ function initQueryParams() {
         format: "yyyy-mm-dd"
     });
     // 仅选择日期
-    $("#end-time").datetimepicker(
+    $("#end_time").datetimepicker(
     {
         language:  "zh-CN",
         weekStart: 1,
@@ -37,6 +37,9 @@ function initQueryParams() {
     if(page_params && page_params.status) {
         cur_status = page_params.status;
     }
+    if(cur_status==4){
+        $("#dispatchPatchBtn").show();
+    }
 }
 //初始化表行按钮
 function initTableRowBtn() {
@@ -50,9 +53,13 @@ function initTableRowBtn() {
 }
 //查询任务
 function queryTask(){
+    var start_time = "";
+    if($("#start_time").val()) start_time = $("#start_time").val()+" 00:00:00";
+    var end_time = "";
+    if($("#end_time").val()) end_time = $("#end_time").val()+" 23:59:59"; 
     var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
+        "start_time": start_time,
+        "end_time": end_time,
         "checked_dept": $("#fsList").val(),
         "check_status":cur_status
     }

VisualInspection/js/mytask/unchecked1111111.js

@@ -1,318 +0,0 @@
-// var page_size=10;
-function queryUncheckedTask(){
-    var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#fsList").val(),
-        "check_status":2
-    }
-    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'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                // {width: 100, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 100, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showCheck',text:'稽查',icon_class:'icon-eye-open'}
-                    ]
-                }
-            ];
-    
-    // var pager = {
-    //     page_size:10
-    // }
-    $('.datatable').mytable({'cols':cols,
-                            'url':"/task/getTaskList/",
-                            'param':data}
-                            );
-}
-
-function showCheck(id){
-    // $('#myModal').modal({name:"dd"});
-    $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-    changePage("/view/mytask/check.html");
-}
-
-function queryUnexaminedTask(){
-    var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#fsList").val(),
-        "check_status":21
-    }
-    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'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 100, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showApplyDetail',text:'处理',icon_class:'icon-hand-up'}
-                    ]
-                }
-            ];
-    
-    // var pager = {
-    //     page_size:10
-    // }
-    $('#unexamined_datatable').mytable({'cols':cols,
-                            'url':"/task/getTaskList/",
-                            'param':data}
-                            );
-}
-
-function showApplyDetail(id){
-    layer.open({
-        type: 1,
-        area: ['400px','500px'],
-        title: '申请处理',
-        closeBtn: 1,
-        shadeClose: true,
-        skin: 'layui-layer-lan',
-        content: $('#apply_detail_div'),
-        btn: ['同意', '拒绝'],
-        btnAlign: 'c', //按钮居中
-        shade: 0 ,//不显示遮罩
-        yes: function(index){
-            aggreeApply(id);
-            layer.close(index);
-        },
-        btn2: function(index){
-            refuseApply(id)
-            layer.close(index);
-        }
-    });
-    var param = {
-        'id':id
-    };
-    post_common_service('/checkApply/getByTaskId', param, function(data) {
-        $('#apply_man').val(data.apply_man);
-        $('#apply_time').val(data.apply_time);
-        $('#apply_reason').val(data.apply_reason);
-        $('#apply_id').val(data.id);        
-    });
-}
-function aggreeApply(taskId){
-    var param = {
-        'id':$('#apply_id').val(),
-        'task_id':taskId
-    };
-    addOrUpdateItem4Common(param,'/checkApply/agree',queryUnexaminedTask);
-}
-
-function refuseApply(taskId){
-     var param = {
-        'id':$('#apply_id').val(),
-        'task_id':taskId
-    };
-    addOrUpdateItem4Common(param,'/checkApply/refuse',queryUnexaminedTask);
-}
-
-function queryUndispatchedTask(){
-    var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#fsList").val(),
-        "check_status":4
-    }
-    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'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
-                        {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}
-                    ]
-                }
-            ];
-    
-    // var pager = {
-    //     page_size:10
-    // }
-    $('#undispatched_datatable').mytable({'cols':cols,
-                            'url':"/task/getTaskList/",
-                            'param':data}
-                            );
-}
-function showTaskDetail(id){
-    var rowData=getItemByIdFromArr(id,$('#undispatched_datatable').mytable('getTableData'));
-    $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
-}
-
-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
-        }
-
-        no_return_common_service('/task/dispatch', param, function(data){
-            queryUndispatchedTask();
-            layer.msg(data, {
-                time: 2000//20s后自动关闭
-            });
-        });
-    }, function(index){
-        layer.close(index);
-    });
-   
-}
-
-function dispatchTaskById(id){
-    layer.confirm('确定下发任务？', {
-        btn: ['确定','取消'] //按钮
-    }, function(){
-       var param = {
-            "id": id,
-            "check_status":5
-        }
-       no_return_common_service('/task/dispatchById', param, function(data){
-            queryUndispatchedTask();
-            layer.msg(data, {
-                time: 2000//20s后自动关闭
-            });
-        });
-    }, function(index){
-        layer.close(index);
-    });
-    
-}
-
-function queryDispatchedTask(){
-    var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#fsList").val(),
-        "check_status":5
-    }
-    var hide = false;
-    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
-        hide = true;
-    }
-    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'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true,hide:hide, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showTaskDetail1',text:'详情',icon_class:'icon-tasks'}
-                    ]
-                }
-            ];
-    
-    // var pager = {
-    //     page_size:10
-    // }
-    $('#dispatched_datatable').mytable({'cols':cols,
-                            'url':"/task/getTaskList/",
-                            'param':data}
-                            );
-}
-
-function showTaskDetail1(id){
-    var rowData=getItemByIdFromArr(id,$('#dispatched_datatable').mytable('getTableData'));
-    $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
-}
-
-function queryConfirmedTask(){
-    var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#fsList").val(),
-        "check_status":6
-    }
-    var hide = false;
-    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
-        hide = true;
-    }
-    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'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true,hide:hide, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showTaskDetail4Confirmed',text:'详情',icon_class:'icon-tasks'}
-                    ]
-                }
-            ];
-    
-    // var pager = {
-    //     page_size:10
-    // }
-    $('#confirmed_datatable').mytable({'cols':cols,
-                            'url':"/task/getTaskList/",
-                            'param':data}
-                            );
-}
-
-function showTaskDetail4Confirmed(id){
-    var rowData=getItemByIdFromArr(id,$('#confirmed_datatable').mytable('getTableData'));
-    $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
-}
-
-function queryUnsubmitTask(){
-    var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#fsList").val(),
-        "check_status":3
-    }
-    var hide = false;
-    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
-        hide = true;
-    }
-    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'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true,hide:hide, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showTaskDetail4Confirmed',text:'详情',icon_class:'icon-tasks'}
-                    ]
-                }
-            ];
-    
-    // var pager = {
-    //     page_size:10
-    // }
-    $('#submit_datatable').mytable({'cols':cols,
-                            'url':"/task/getTaskList/",
-                            'param':data}
-                            );
-}
-
-function showTaskDetail4Confirmed(id){
-    var rowData=getItemByIdFromArr(id,$('#submit_datatable').mytable('getTableData'));
-    $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
-}

VisualInspection/js/mytask/undispatched111.js

@@ -1,87 +0,0 @@
-// var page_size=10;
-function queryUndispatchedTask(){
-    var data = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "checked_dept": $("#fsList").val()
-    }
-    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'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showTaskDetail',text:'稽查',icon_class:'icon-edit'}
-                    ]
-                }
-            ];
-    
-    // var pager = {
-    //     page_size:10
-    // }
-    $('.datatable').mytable({'cols':cols,
-                            'url':"/task/getTaskList/",
-                            'param':data}
-                            );
-}
-function showTaskDetail(){
-    changePage("/view/mytask/taskDetail.html");
-}
-function showCheck(){
-    $('#code_flag').val('');
-    $('#flag_name').val('');
-    $('#code_value').val('');
-    $('#code_name').val('');
-    $('#sort_no').val('');
-    $('#remark').val('');
-    $("#valid").attr('checked','true');
-    showPopup4Common('稽查页面',function(){
-        addOrUpdateConstant("/constant/add/");
-    },'400px');
-}
-var cur_id;
-function addOrUpdateConstant(url){
-    var valid=1;
-    if(!$("#valid").is(':checked')) valid=0;
-    var param ={
-        'id':cur_id,
-        'code_flag':$('#code_flag').val(),
-        'flag_name':$('#flag_name').val(),
-        'code_value':Number($('#code_value').val()),
-        'code_name':$('#code_name').val(),
-        'sort_no':Number($('#sort_no').val()),
-        'remark':$('#remark').val(),
-        'valid':valid
-    };
-    addOrUpdateItem4Common(param,url,queryConstant);
-}
-
-function showEditConstant(id){
-    cur_id='';
-    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-    if(rowData) {
-        cur_id = rowData.id;
-        $('#code_flag').val(rowData.code_flag);
-        $('#flag_name').val(rowData.flag_name);
-        $('#code_value').val(rowData.code_value);
-        $('#code_name').val(rowData.code_name);
-        $('#sort_no').val(rowData.sort_no);
-        $('#remark').val(rowData.remark);
-        if(rowData.valid==1){
-            $("#valid").attr('checked','true');
-        }else{
-            $("#valid").attr('checked','false');
-        }
-        showPopup4Common('修改常量',function(){
-            addOrUpdateConstant("/constant/update/");
-        },'400px');
-    }
-}
-
-function deleteConstant(id){
-    deleteItem4Common(id,"/constant/delete/",queryConstant);
-}

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -28,31 +28,31 @@
 
         // 请求收费人员排班数据
         function calendarInit(data_param){
-            var data = {
+            var datap = {
                 "dept_id": user_dept_id ,
-                "start_time":getCurrentMonthFirst(),
-                "end_time":getCurrentMonthLast(),
+                "start_time":getMonthByCondition(date_cursor,'first').Format("yyyy-MM-dd HH:mm:ss"),//getCurrentMonthFirst(),
+                "end_time":getMonthByCondition(date_cursor,'last').Format("yyyy-MM-dd HH:mm:ss"),//getCurrentMonthLast(),
                  'type':team_type
             }
             if(data_param != undefined){
-                data = data_param ;
+                datap = data_param ;
             }
-            getTeamClass(data,function(data){
+            getTeamClass(datap,function(data){
                 var newEvents = [];
 
                 
 
                 // console.log(data);
                 for(var i=0;i<data.length;i++){
-                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].start_time, end: data[i].end_time};
+                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].start_time, end: data[i].start_time};//都以开始时间的日期为准
                     newEvents.push(obj);
                 }
                
 
                  // 这里轮训给每天都增加一个事件
                
-                var date = new Date();
-                var end_date =new Date(getCurrentMonthLast2()) ;
+                var date = getMonthByCondition(date_cursor,'first');//new Date();
+                var end_date = getMonthByCondition(date_cursor,'last');//new Date(getCurrentMonthLast2()) ;
                 if(data_param != undefined){
                     date =  new Date(data_param.start_time);
                     end_date = new Date(data_param.end_time) ;
@@ -60,13 +60,13 @@
 
 
                 for(var i =0;i<31;i++){
-                    if( date.setDate(i+1) <= end_date ){
-                        var obj =  {id:-1 ,desc:'详细排班' ,title: '+详细排班',  start:date.format('yyyy-MM-dd'), end: date.format('yyyy-MM-dd'),color:'#bd7b46'};
+                    if( date.setDate(i+1) < end_date ){
+                        var obj =  {id:-1 ,desc:'详细排班' ,title: '+详细排班',  start:date.Format('yyyy-MM-dd'), end: date.Format('yyyy-MM-dd'),color:'#bd7b46'};
                         newEvents.push(obj);
                     }
                 }
 
-
+              
                 calendar.addEvents(newEvents);
             })
         }
@@ -146,7 +146,10 @@
         function getCurrentMonthFirst(){
             var date=new Date();
             date.setDate(1);
-            return date.toLocaleDateString()+" 00:00:00";
+            date.setHours(0);
+            date.setMinutes(0);
+            date.setSeconds(0);
+            return date.Format("yyyy-MM-dd HH:mm:ss");
         }
 
         // 当月最后一天
@@ -156,7 +159,11 @@
             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";
+            var date1 = new Date(nextMonthFirstDay-oneDay);
+            date1.setHours(23);
+            date1.setMinutes(59);
+            date1.setSeconds(59);
+            return date1.Format("yyyy-MM-dd HH:mm:ss");
         }
 
 
@@ -166,8 +173,13 @@
             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()+" 23:59:00";
+            var oneDay=0;//1000*60*60*24;
+
+            var date1 = new Date(nextMonthFirstDay-oneDay);
+            date1.setHours(0);
+            date1.setMinutes(0);
+            date1.setSeconds(0);
+            return date1.Format("yyyy-MM-dd HH:mm:ss");
         }
 
         // 上一个月或者下个月的第一天或者最后一天
@@ -175,17 +187,24 @@
             if(first_or_last == 'first'){
                 var date=new Date();
                 date.setDate(1);
+                date.setHours(0);
+                date.setMinutes(0);
+                date.setSeconds(0);
                 date.setMonth(date.getMonth()+pre_or_after);
                 return date;
             }else if(first_or_last == 'last'){
                 var date = new Date();
+                date.setMonth(date.getMonth()+pre_or_after);//此处月份加减，不能放到最后加减，会引起月份天数不对
                 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 ;
+                
+                var date1 = nextMonthFirstDay;
+                date1.setDate(date1.getDate()-1);
+                date1.setHours(23);
+                date1.setMinutes(59);
+                date1.setSeconds(59);
+                return date1 ;
             }
         }
 
@@ -241,14 +260,14 @@
 
                 // 这边负责添加整个页面的数据 按车道排班 
                 $('#add_fee_station').modal();
-                $(".modal-title").html("收费站排班表-"+event.event.start.format("yyyy-MM-dd"));
+                $(".modal-title").html("收费站排班表-"+event.event.start.Format("yyyy-MM-dd"));
 
-                $("#save_user_class").data("work_date",event.event.start.format("yyyy-MM-dd "));
+                $("#save_user_class").data("work_date",event.event.start.Format("yyyy-MM-dd "));
 
                  var data = {
                     "dept_id": user_dept_id ,
-                    "start_time":event.event.start.format("yyyy-MM-dd 00:00:00"),
-                    "end_time": event.event.start.format("yyyy-MM-dd 00:00:00"),
+                    "start_time":event.event.start.Format("yyyy-MM-dd 00:00:00"),
+                    "end_time": event.event.start.Format("yyyy-MM-dd 00:00:00"),
                     'type':team_type
                 } 
                 post_common_service( "teamClass/getClassListAndUsers",data,function(data){
@@ -376,14 +395,14 @@
          * 点击日历触发函数
          */
         function click_function(date){
-            setAddTermTitle(date.format("yyyy-MM-dd"));
+            setAddTermTitle(date.Format("yyyy-MM-dd"));
             // 保存当前日期
-            $("#save_term_class").data("date",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"),
+                "start_time":date.Format("yyyy-MM-dd 00:00:00"),
+                "end_time": date.Format("yyyy-MM-dd 00:00:00"),
                  'type':team_type
             }
 
@@ -415,8 +434,8 @@
 
             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"),
+                "start_time":getMonthByCondition(date_cursor,'first').Format("yyyy-MM-dd HH:mm:ss"),
+                "end_time": getMonthByCondition(date_cursor,'last').Format("yyyy-MM-dd HH:mm:ss"),
                  'type':team_type
             }
             updateCalendar(data);
@@ -427,8 +446,8 @@
             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"),
+                "start_time":getMonthByCondition(date_cursor,'first').Format("yyyy-MM-dd HH:mm:ss"),
+                "end_time": getMonthByCondition(date_cursor,'last').Format("yyyy-MM-dd HH:mm:ss"),
                  'type':team_type
             }
             updateCalendar(data);
@@ -445,12 +464,18 @@
             var data = [];
             for(var i=0;i<$("select[id*='_term']").length;i++){
                 if($("select[id*='_term']").eq(i).val()!=""){
+                    var end_time = $("#save_term_class").data("date")+" "+classCode[i+1].end_time+":00";
+                    if(i+1==3){
+                        var date = new Date($("#save_term_class").data("date").replace(/-/,"/"));
+                        date.setDate(date.getDate()+1);
+                        end_time = date.Format("yyyy-MM-dd")+" "+classCode[i+1].end_time+":00";
+                    }
                     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")+" "+ classCode[i+1].start_time+":00" ,
-                        "end_time": $("#save_term_class").data("date")+" "+classCode[i+1].end_time+":00",
+                        "end_time": end_time,
                         "dept_id":user_dept_id
                     };
                     console.log(obj);

VisualInspection/js/teamClass/check_team_schedule.js

@@ -64,7 +64,10 @@
         function getCurrentMonthFirst(){
             var date=new Date();
             date.setDate(1);
-            return date.toLocaleDateString()+" 00:00:00";
+            date.setHours(0);
+            date.setMinutes(0);
+            date.setSeconds(0);
+            return date.Format("yyyy-MM-dd HH:mm:ss");
         }
 
         // 当月最后一天
@@ -74,7 +77,11 @@
             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";
+            var date1 = new Date(nextMonthFirstDay-oneDay);
+            date1.setHours(0);
+            date1.setMinutes(0);
+            date1.setSeconds(0);
+            return date1.Format("yyyy-MM-dd HH:mm:ss");
         }
 
         // 上一个月或者下个月的第一天或者最后一天

VisualInspection/js/util/util.js

@@ -232,7 +232,7 @@ Date.prototype.Format = function (fmt) {
 	 var o = {
 	     "M+": this.getMonth() + 1, 
 	     "d+": this.getDate(), 
-	     "h+": this.getHours(), 
+	     "H+": this.getHours(), 
 	     "m+": this.getMinutes(), 
 	     "s+": this.getSeconds(), 
 	     "q+": Math.floor((this.getMonth() + 3) / 3), 
@@ -367,4 +367,23 @@ function showClientImg(src){
 
 function downloadClientfile(src){
     callFunc("downloadfile", src);
-}
+}
+
+// function initDateFormat(){
+//     Date.prototype.Format = function (fmt) { //author: meizz 
+//     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;
+//     }
+// }
+// initDateFormat();

VisualInspection/view/appeal_management/appeal_checked.html

@@ -5,10 +5,10 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
                 <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                    <input type="text" id="start_time" class="form-control form-date" placeholder="开始时间">
                 </div>
                 <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                    <input type="text" id="end_time" class="form-control form-date" placeholder="截止时间">
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
                 <div class="col-sm-2">
@@ -16,7 +16,7 @@
                     </select>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUncheckedTask()">查询</button>
+                    <button class="btn btn-primary " type="button" onclick="queryCheckedAppealTask()">查询</button>
                 </div>
             </div>
         </form>
@@ -28,7 +28,7 @@
 <script>
     $(document).ready(function() {
         // 仅选择日期
-        $("#start-time").datetimepicker(
+        $("#start_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,
@@ -41,7 +41,7 @@
             format: "yyyy-mm-dd"
         });
         // 仅选择日期
-        $("#end-time").datetimepicker(
+        $("#end_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,

VisualInspection/view/appeal_management/appeal_list.html

@@ -6,14 +6,14 @@
                 <div class="form-group">
                     <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
                     <div class="col-sm-2">
-                        <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                        <input type="text" id="start_time" class="form-control form-date" placeholder="开始时间">
                     </div>
                     <div class="col-sm-2">
-                        <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                        <input type="text" id="end_time" class="form-control form-date" placeholder="截止时间">
                     </div>
                     <label for="exampleInputAccount1" class="col-sm-1">稽查部门</label>
                     <div class="col-sm-2">
-                        <select class="form-control" id="dept_select">
+                        <select class="form-control" id="fsList">
                             <option value="">全部</option>
                         </select>
                     </div>

VisualInspection/view/appeal_management/appeal_submited.html

@@ -5,10 +5,10 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
                 <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                    <input type="text" id="start_time" class="form-control form-date" placeholder="开始时间">
                 </div>
                 <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                    <input type="text" id="end_time" class="form-control form-date" placeholder="截止时间">
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
                 <div class="col-sm-2">
@@ -16,7 +16,7 @@
                     </select>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUncheckedTask()">查询</button>
+                    <button class="btn btn-primary " type="button" onclick="querySubmitedAppealTask()">查询</button>
                 </div>
             </div>
         </form>
@@ -28,7 +28,7 @@
 <script>
     $(document).ready(function() {
         // 仅选择日期
-        $("#start-time").datetimepicker(
+        $("#start_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,
@@ -41,7 +41,7 @@
             format: "yyyy-mm-dd"
         });
         // 仅选择日期
-        $("#end-time").datetimepicker(
+        $("#end_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,

VisualInspection/view/main.html

@@ -7,13 +7,11 @@
     <link rel="import" href="/view/common/commoncsslink.html?__inline">
     <link rel="stylesheet" type="text/css" href="/css/main.css">
     <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-    <!--<script src="/js/mytask/unchecked.js"></script>-->
+    <style>
+        img.lightbox-img{width:600px;height:600px;}
+    </style>
     <script src="/js/mytask/check.js"></script>   
     <script src="/js/teamClass/charge_team_schedule.js"></script>
-    <!--<link rel="stylesheet" type="text/css" href="/css/user/userManager.css?__inline">
-<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
-<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
-<script src="/js/menu/menu.js"></script>-->
 </head>
 
 <body>

VisualInspection/view/mytask/apply_task.html

@@ -5,10 +5,10 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
                 <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                    <input type="text" id="start_time" class="form-control form-date" placeholder="开始时间">
                 </div>
                 <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                    <input type="text" id="end_time" class="form-control form-date" placeholder="截止时间">
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
                 <div class="col-sm-2">

VisualInspection/view/mytask/check.html

@@ -10,7 +10,8 @@
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">车道号</label>
                 <div class="col-sm-2">
-                    <select class="form-control" id="lane" disabled="disabled"></select>
+                    <!--<select class="form-control" id="lane" disabled="disabled"></select>-->
+                    <input type="text" class="form-control" id="lane" disabled="disabled"/>
                 </div>
                 <label class="col-sm-1">考核人员</label>
                 <div class="col-sm-3" id="user_img_container">
@@ -69,6 +70,8 @@
                     </div>
                     </div>
                 </section>
+               
+                
             </div>
             
         </div>

VisualInspection/view/mytask/checked.html

@@ -5,10 +5,10 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
                 <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                    <input type="text" id="start_time" class="form-control form-date" placeholder="开始时间">
                 </div>
                 <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                    <input type="text" id="end_time" class="form-control form-date" placeholder="截止时间">
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
                 <div class="col-sm-2">
@@ -16,7 +16,7 @@
                     </select>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUncheckedTask()">查询</button>
+                    <button class="btn btn-primary " type="button" onclick="queryCheckedTask()">查询</button>
                 </div>
             </div>
         </form>
@@ -28,7 +28,7 @@
 <script>
     $(document).ready(function() {
         // 仅选择日期
-        $("#start-time").datetimepicker(
+        $("#start_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,
@@ -41,7 +41,7 @@
             format: "yyyy-mm-dd"
         });
         // 仅选择日期
-        $("#end-time").datetimepicker(
+        $("#end_time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,

VisualInspection/view/mytask/confirmed11.html

@@ -1,68 +0,0 @@
-<!--<script src="/js/mytask/unchecked.js"></script> -->
-<div class="container-fluid ">
-    <div class="row">
-        <form  class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
-                </div>
-                <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
-                </div>
-                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
-                <div class="col-sm-2">
-                    <select class="form-control" id="fsList">
-                    </select>
-                </div>
-                <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUnexaminedTask()">查询</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <br>
-
-    <div id="confirmed_datatable"></div>
-</div>
-<div id="apply_detail_div" style="display:none;text-align:center;">
-    <link rel="import" href="/view/mytask/applyDetail.html?__inline">   
-</div> 
-<script>
-    $(document).ready(function() {
-        // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        if(hasRole(ROLE_STATION_ADMIN)){
-            var user = getCurrentUser();
-            setFeSelect("#fsList",user.organid);
-            $("#fsList").attr("disabled","disabled"); 
-        }else{
-            setFeSelect("#fsList");
-        }
-        queryConfirmedTask();
-    });
-</script>

VisualInspection/view/mytask/dispatched11.html

@@ -1,68 +0,0 @@
-<!--<script src="/js/mytask/unchecked.js"></script> -->
-<div class="container-fluid ">
-    <div class="row">
-        <form  class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
-                </div>
-                <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
-                </div>
-                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
-                <div class="col-sm-2">
-                    <select class="form-control" id="fsList">
-                    </select>
-                </div>
-                <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUnexaminedTask()">查询</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <br>
-
-    <div id="dispatched_datatable"></div>
-</div>
-<div id="apply_detail_div" style="display:none;text-align:center;">
-    <link rel="import" href="/view/mytask/applyDetail.html?__inline">   
-</div> 
-<script>
-    $(document).ready(function() {
-        // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        if(hasRole(ROLE_STATION_ADMIN)){
-            var user = getCurrentUser();
-            setFeSelect("#fsList",user.organid);
-            $("#fsList").attr("disabled","disabled"); 
-        }else{
-            setFeSelect("#fsList");
-        }
-        queryDispatchedTask();
-    });
-</script>

VisualInspection/view/mytask/taskDetail.html

@@ -155,7 +155,8 @@
                     {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
                     {width: 200, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'}
                 ];
-        if(hasRole(ROLE_JICHA)) {
+        if(hasRole(ROLE_JICHA) && ($.checkTask.check_status==2||$.checkTask.check_status==2||$.checkTask.check_status==12
+            ||$.checkTask.check_status==13)) {
             var oper = {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
                         oper:[
                             {func:'showEditScore',text:'修改',icon_class:'icon-edit'},

VisualInspection/view/mytask/task_list.html

@@ -5,10 +5,10 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
                 <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                    <input type="text" id="start_time" class="form-control form-date" placeholder="开始时间">
                 </div>
                 <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                    <input type="text" id="end_time" class="form-control form-date" placeholder="截止时间">
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
                 <div class="col-sm-2">
@@ -16,7 +16,10 @@
                     </select>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryTable()">查询</button>
+                    <button class="btn btn-primary " type="button" onclick="queryTask()">查询</button>
+                </div>
+                <div id="dispatchPatchBtn" style="float:right;margin-right:20px;display:none;">
+                    <button class="btn btn-success" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-plus-sign"></i> 一键下发</button>
                 </div>
             </div>
         </form>

VisualInspection/view/mytask/unchecked111.html

@@ -1,59 +0,0 @@
-<script src="/js/mytask/unchecked.js"></script> 
-<div class="container-fluid ">
-    <div class="row">
-        <form  class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
-                </div>
-                <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
-                </div>
-                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
-                <div class="col-sm-2">
-                    <select class="form-control" id="fsList">
-                    </select>
-                </div>
-                <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUncheckedTask()">查询</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <br>
-
-    <div class="datatable"></div>
-</div>
-<script>
-    $(document).ready(function() {
-        // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        setFeSelect("#fsList");
-        queryUncheckedTask();
-    });
-</script>

VisualInspection/view/mytask/undispatched111.html

@@ -1,65 +0,0 @@
-<!--<script src="/js/mytask/unchecked.js"></script> -->
-<div class="container-fluid ">
-    <div class="row">
-        <form  class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
-                </div>
-                <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
-                </div>
-                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
-                <div class="col-sm-2">
-                    <select class="form-control" id="fsList">
-                    </select>
-                </div>
-                <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUnexaminedTask()">查询</button>
-                </div>
-                <div style="float:right;">
-                    <button class="btn btn-success" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-plus-sign"></i> 一键下发</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <br>
-
-    <div id="undispatched_datatable"></div>
-</div>
-<div id="apply_detail_div" style="display:none;text-align:center;">
-    <link rel="import" href="/view/mytask/applyDetail.html?__inline">   
-</div> 
-<script>
-    $(document).ready(function() {
-        // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        setFeSelect("#fsList");
-        queryUndispatchedTask();
-    });
-</script>

VisualInspection/view/mytask/unsubmit1111.html

@@ -1,68 +0,0 @@
-<!--<script src="/js/mytask/unchecked.js"></script> -->
-<div class="container-fluid ">
-    <div class="row">
-        <form  class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
-                </div>
-                <div class="col-sm-2">
-                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
-                </div>
-                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
-                <div class="col-sm-2">
-                    <select class="form-control" id="fsList">
-                    </select>
-                </div>
-                <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUnexaminedTask()">查询</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <br>
-
-    <div id="confirmed_datatable"></div>
-</div>
-<div id="apply_detail_div" style="display:none;text-align:center;">
-    <link rel="import" href="/view/mytask/applyDetail.html?__inline">   
-</div> 
-<script>
-    $(document).ready(function() {
-        // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        if(hasRole(ROLE_STATION_ADMIN)){
-            var user = getCurrentUser();
-            setFeSelect("#fsList",user.organid);
-            $("#fsList").attr("disabled","disabled"); 
-        }else{
-            setFeSelect("#fsList");
-        }
-        queryConfirmedTask();
-    });
-</script>

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

@@ -21,6 +21,7 @@ import com.xintong.visualinspection.bean.TaskStatus;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CheckApplyService;
 import com.xintong.visualinspection.service.TaskService;
+import com.xintong.visualinspection.util.AuthorUtil;
 import com.xintong.visualinspection.util.CacheUtil;
 import com.xintong.visualinspection.util.Constants;
 
@@ -179,8 +180,12 @@ public class CheckApplyController extends BaseController {
     }
     
     @RequestMapping(value = "/getList/{page}/{size}")
-    public String getList(@RequestBody CheckApply param ,@PathVariable Integer page,@PathVariable Integer size){
+    public String getList(HttpServletRequest request,@RequestBody CheckApply param ,@PathVariable Integer page,@PathVariable Integer size){
     	PageHelper.startPage(page, size);
+    	User user = getCurrentUser(request);
+    	if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
+    		param.setApply_man(new Long(user.getId()));
+    	}
     	List<CheckApply> checkAppeal =  checkApplyService.getList(param) ;
     	return super.returnSuccessResult(new PageInfo(checkAppeal));
     }

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

@@ -22,7 +22,8 @@
     </resultMap>
 
     <select id="getList" resultMap="BaseResultMap" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >
-        SELECT ca.*,ct.name,ct.start_time,ct.end_time,sc.code_name FROM check_appeal ca LEFT JOIN check_task ct ON ca.task_id=ct.id 
+        SELECT ca.*,ct.name,ct.start_time,ct.end_time,sc.code_name 
+        FROM check_appeal ca LEFT JOIN check_task ct ON ca.task_id=ct.id 
         LEFT JOIN sys_code sc ON ca.check_status=sc.code_value
         WHERE 1=1 
         <if test="start_time != null">AND ct.start_time >= #{start_time}</if>
@@ -30,6 +31,7 @@
         	<![CDATA[ AND ct.end_time < #{end_time}]]>
         </if>
         <if test="appeal_dept != null">AND ca.appeal_dept = #{appeal_dept}</if>
+        <if test="apply_man != null">AND ct.checkman = #{apply_man}</if>
         ORDER BY ca.appeal_time DESC
     </select>
 

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

@@ -56,8 +56,8 @@
         FROM check_task
         WHERE 1=1
         	<if test="check_status != null">AND check_status = #{check_status}</if>
-        	<if test="start_time != null">AND create_time &gt;= #{start_time}</if>
-        	<if test="end_time != null">AND create_time &lt;= #{end_time}</if>
+        	<if test="start_time != null">AND start_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND end_time &lt;= #{end_time}</if>
         	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
         	<if test="checkman != null">AND checkman = #{checkman}</if>
         	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
@@ -70,8 +70,8 @@
         FROM check_task
         WHERE 1=1
         	<if test="check_status != null">AND check_status >= #{check_status}</if>
-        	<if test="start_time != null">AND create_time &gt;= #{start_time}</if>
-        	<if test="end_time != null">AND create_time &lt;= #{end_time}</if>
+        	<if test="start_time != null">AND start_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND end_time &lt;= #{end_time}</if>
         	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
         	<if test="checkman != null">AND checkman = #{checkman}</if>
         	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
@@ -85,8 +85,8 @@
         WHERE 1=1
         	<if test="check_status != null">AND check_status >= #{check_status}</if>
         	<if test="check_status != null">AND check_status &lt;= #{check_status_end}</if>
-        	<if test="start_time != null">AND create_time &gt;= #{start_time}</if>
-        	<if test="end_time != null">AND create_time &lt;= #{end_time}</if>
+        	<if test="start_time != null">AND start_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND end_time &lt;= #{end_time}</if>
         	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
         	<if test="checkman != null">AND checkman = #{checkman}</if>
         	<if test="checked_person != null">AND checked_person = #{checked_person}</if>

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

@@ -41,7 +41,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) tc WHERE tc.type =#{type}
+        ORDER BY t.class_type asc,t.work_date ASC) tc WHERE tc.type =#{type}
     </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.TeamClass" >