修改bug

VisualInspection/js/appeal_management/appeal_list.js

@@ -146,6 +146,7 @@ function queryUnAssignedTable(){
 //进入稽查页面
 function showCheck(id){
     // $('#myModal').modal({name:"dd"});
+    // alert(id);
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
         $.checkTask = rowData;

VisualInspection/js/lib/mytable.js

@@ -104,6 +104,8 @@
                     rows:rowData
                 }
             );
+
+            $('a.lightbox-toggle').lightbox();//图片轮播
             function formatTableData(data,cols,p_cur){
                 var rows = [];
                 for(var i=0;i<data.length;i++){

VisualInspection/js/mytask/apply_task.js

@@ -0,0 +1,160 @@
+
+    function initApplyPage(){
+        // 仅选择日期
+        $("#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");
+        //获取页面参数
+        var page_params = $.zui.store.get("page_params");
+        if(page_params && page_params.status) {
+            cur_status = page_params.status;
+        }
+        
+        queryUnexaminedTask();
+    }
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_21_"+ROLE_JICHA_ADMIN,[{func:'showApplyDetail',text:'处理',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_21_"+ROLE_JICHA,[{func:'showApplyDetail1',text:'详情',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_22",[{func:'showApplyDetail1',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_23",[{func:'showApplyDetail1',text:'详情',icon_class:'icon-tasks'}]);
+}
+
+function queryUnexaminedTask(){
+    initTableRowBtn();
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "checked_dept": $("#fsList").val(),
+        "check_status":cur_status
+    }
+    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 colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};  
+    if(cur_status==21){
+        if(hasRole(ROLE_JICHA)){
+            colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status+"_"+ROLE_JICHA);   
+        }else if(ROLE_JICHA_ADMIN){
+            colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status+"_"+ROLE_JICHA_ADMIN);  
+        }
+    }else{
+        colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);
+    }
+    console.log(colFunc.oper);
+    cols.push(colFunc);
+    // var pager = {
+    //     page_size:10
+    // }
+    $('#unexamined_datatable').mytable({'cols':cols,
+                            'url':"/task/getTaskList/",
+                            'param':data}
+                            );
+}
+function showApplyDetail1(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){
+            layer.close(index);
+        }
+    });
+    var param = {
+        'id':id
+    };
+    post_common_service('/checkApply/getByTaskId', param, function(data) {
+        $('#apply_man').val(data.apply_man_name);
+        $('#apply_time').val(data.apply_time);
+        $('#apply_reason').val(data.apply_reason);
+        $('#apply_id').val(data.id);        
+    });
+}
+
+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_name);
+        $('#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);
+}

VisualInspection/js/mytask/check.js

@@ -263,6 +263,7 @@ function changePersonContent(data) {
     if (data.workno) name = data.workno + " " + data.truename;
     $("#checked_person").html(name);
     var imgSrc = base_image_server_url+data.pic;
+    $("#person_img > img").attr("src", imgSrc);
     if(ISCLIENT) {
         $("#person_img").attr("href", "javascript:void(0)");
         $("#person_img").click(function(){
@@ -270,9 +271,8 @@ function changePersonContent(data) {
         });
     }else {       
         $("#person_img").attr("href", imgSrc);
+        $('a.lightbox-toggle').lightbox();
     }
-    $("#person_img > img").attr("src", imgSrc);
-    $('a.lightbox-toggle').lightbox();
 }
 var scoreLayer;
 function showScore() {
@@ -430,7 +430,7 @@ function submitCheck() {
         layer.msg("提交成功", {
             time: 2000//20s后自动关闭
         });
-        changePage("/view/mytask/unchecked.html");
+        changePage("/view/mytask/task_list.html?status=2");
     });
 
 }
@@ -453,7 +453,7 @@ function submitCheck4Appeal() {
         layer.msg("提交成功", {
             time: 2000//20s后自动关闭
         });
-        changePage("/view/mytask/unchecked.html");
+        changePage("/view/mytask/task_list.html?status=2");
     });
 
 }
@@ -470,7 +470,7 @@ function saveValidReason() {
         layer.msg("申请提交成功", {
             time: 2000//20s后自动关闭
         });
-        changePage("/view/mytask/unchecked.html");
+        changePage("/view/mytask/task_list.html?status=2");
     });
 }
 

VisualInspection/js/util/util.js

@@ -292,10 +292,11 @@ function hasRole(role){
     return false;
 }
 
-function setCheckmanSelect(div,selectId){
+function setCheckmanSelect(div, selectId, notHaveUserId){
     post_common_service("/user/getAllCheckman",null,function(data){
-        var optStr = '<option value="">全部</option>';
+        var optStr = '';
         for(var i in data) {
+            if(data[i].id==notHaveUserId) continue;
             if(data[i].id==selectId)
                 optStr += '<option value="'+data[i].id+'" selected="selected">'+data[i].truename+'</option>';
             else

VisualInspection/view/appeal_management/appealDetail.html

@@ -33,7 +33,7 @@
         url: base_image_server_url +'fileServer/file/upload',  // 文件上传提交地址
         onFileUploaded: function(file, responseObject){
             var datas = eval('('+responseObject.response+')');
-            file_src += base_image_server_url + datas.result_data.path+",";
+            file_src += datas.result_data.path+",";
         },
         onFilesRemoved:function(files) {
             // alert(files);

VisualInspection/view/mytask/unexamined111.html → VisualInspection/view/mytask/apply_task.html

@@ -1,4 +1,4 @@
-<!--<script src="/js/mytask/unchecked.js"></script> -->
+<script src="/js/mytask/apply_task.js"></script>
 <div class="container-fluid ">
     <div class="row">
         <form  class="form-horizontal">
@@ -30,33 +30,7 @@
 </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");
-        queryUnexaminedTask();
+        initApplyPage();
     });
+
 </script>

VisualInspection/view/mytask/taskDetail.html

@@ -51,6 +51,7 @@
         <div>
             <button id="submitBtn" style="display:none" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
             <button id="confirmBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
+            <button id="submitAppealBtn" style="display:none" type="button" class="btn btn-warning" onclick="submitCheck4Appeal()">复核提交</button>
             <button id="confirmAppealBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck4Appeal()">申诉结果确认</button>
             <button id="appealBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
             <button id="assignBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAssign()">分配</button>
@@ -113,12 +114,15 @@
         genFlow();
         queryScores();
        
-        $('a.lightbox-toggle').lightbox();
+       
     });
     
     //初始化表行按钮
     function initBtns() {
+        $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_2",["#submitBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_3",["#submitBtn"]);
+        $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_12",["#submitAppealBtn"]);
+        $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_13",["#submitAppealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_11",["#assignBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_STATION_ADMIN+"_5",["#confirmBtn","#appealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_STATION_ADMIN+"_15",["#confirmAppealBtn"]);
@@ -128,26 +132,6 @@
         showBtn(ROLE_JICHA,$.checkTask.check_status);
         showBtn(ROLE_JICHA_ADMIN,$.checkTask.check_status);
         showBtn(ROLE_STATION_ADMIN,$.checkTask.check_status);
-
-        // if(hasRole(ROLE_JICHA_ADMIN && $.checkTask.check_status==11)) {
-        //     $("#assignBtn").show();
-        // }else{
-        //     $("#assignBtn").hide();
-        // }
-
-        // if(hasRole(ROLE_STATION_ADMIN) && $.checkTask.check_status==5) {
-        //     $("#confirmBtn").show();
-        //     $("#appealBtn").show();
-        // }else{
-        //     $("#appealBtn").hide();
-        //     $("#confirmBtn").hide();
-        // }
-
-        // if(hasRole(ROLE_STATION_ADMIN) && $.checkTask.check_status==15) {
-        //     $("#confirmAppealBtn").show();
-        // }else{
-        //     $("#confirmAppealBtn").hide();
-        // }
     }
     function showBtn(role, status) {
         if(hasRole(role)) {
@@ -184,17 +168,19 @@
                                 'url':"/score/getScoreList/",
                                 'param':data}
                                 );
+        $('a.lightbox-toggle').lightbox();
     }
     var curScoreId;
     function showEditScore(id){
+        
         var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
         // alert(rowData.pics);
         curScoreId = rowData.id;
         scoreImageLayer = showPopup4Common('修改图片',updateImg,'600px');
-        showPics(rowData.pics);
+        showTaskDetailPics(rowData.pics);
     }
 
-    function showPics(pics,divId){
+    function showTaskDetailPics(pics,divId){
         var picStr='';
         if(!divId) divId = '#img_container';
         $(divId).html(picStr);
@@ -273,6 +259,20 @@
         
     }
 
+    function submitCheck4Appeal(){
+        var param = {
+            "id": $.checkTask.id,
+            "check_status":14
+        }
+        no_return_common_service("/task/update/",param,function(data){
+             layer.msg(data, {
+                time: 2000//20s后自动关闭
+             });
+            changePage("/view/mytask/task_list.html?status=13");
+        });
+        
+    }
+
     var appealLayer;
     function showAppeal(){
         // appealLayer = showPopup4Common('申诉',saveAppeal,'600px','#appealDetail-div');
@@ -323,7 +323,7 @@
         showPopup4Common('分配稽查员',function(){
             saveAssign();
         },'400px','#chooseCheckman-div');
-        setCheckmanSelect('#choseCheckmanList');
+        setCheckmanSelect('#choseCheckmanList',null,$.checkTask.checkman);
     }
 
     function saveAssign(){