任务管理界面逻辑

VisualInspection/dist/js/appeal_management/appeal_list.js

@@ -1,34 +1,138 @@
-$(document).ready(function(){
+var cur_status;
+function initAppealPage() {
+    initQueryParams();
+    initTableRowBtn();
+    queryAppeal();
+}
+function initQueryParams() {
+    // 仅选择日期
+    $("#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("#dept_select");
+    //获取页面参数
+    var page_params = $.zui.store.get("page_params");
+    if(page_params && page_params.status) {
+        cur_status = page_params.status;
+    }
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_11",[{func:'seeCheckAudit',text:'处理',icon_class:'icon-phone-sign'}]);
+    $.zui.store.set("task_table_btn_3",[{func:'showContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_4",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
+                                        {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}]);
+    $.zui.store.set("task_table_btn_5",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_6",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_21",[{func:'showApplyDetail',text:'处理',icon_class:'icon-hand-up'}]);
+}
+
+function initAppealList() {
     queryTable();   
-    function queryTable(){
-        var data = {}
-        var name = $("#select_name").val();
-        if(name!=''){
-            data.name = name ;
-        }
-        var start_time = $("#start-time").val();
-        var end_time = $("#end-time").val();
-        var dept_select = $("#dept_select").val();
-        if(start_time != ''){
-            data.start_time = start_time;
-        }
-        if(end_time != ''){
-            data.end_time = end_time;
+}
+
+function queryAppeal(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "checked_dept": $("#dept_select").val(),
+        "check_status": cur_status,
+    }
+    var hide = false;
+    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
+        hide = true;
+    }
+    
+    var cols = [
+            {width: 30, text: '序号', flex: true, colClass: 'text-center',field:'num'},
+            {width: 100, text: '任务名称', flex: true,colClass: '',field:'name'},
+            {width: 80, text: '申诉人员',  flex: true, colClass: '',field:'appeal_man_name'},
+            {width: 100, text: '申诉部门',  flex: true, colClass: '',sort: 'down',field:'appeal_dept_name'},
+            {width: 80, text: '稽查人员', type: 'string', flex: true, hide:hide,colClass: '',field:'checkman_name'},
+            {width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: '',field:'check_period'},
+            {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
+        ];
+    var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   
+    colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);
+    cols.push(colFunc);
+        $('.datatable').mytable({'cols':cols,
+                                'url':"checkAppeal/getList",
+                                'param':data}
+                                );
+    }
+//查看稽查结果
+function seeCheckAudit(id,task_id){
+    // alert("task_id:"+task_id+"---id:"+id)
+    // function showTaskDetail1(id){
+    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    post_common_service("/task/getById", {"id":task_id}, function(data){
+            $.checkTask = data;
+            $.checkTask.appeal = rowData;
+            console.log("申诉："+$.checkTask.appeal.id);
+            changePage("/view/mytask/taskDetail.html");
+        });
+// }
+}
+//再分配
+function distributionAgain(id,task_id){
+    alert("task_id:"+task_id+"---id:"+id)
+}
+
+//详情
+function seeDetail(id,task_id){
+    alert("task_id:"+task_id+"---id:"+id)
+}
+
+function queryUnAssignedTable(){
+        var data = {
+            "start_time": $("#start_time").val(),
+            "end_time": $("#end_time").val(),
+            "checked_dept": $("#dept_select").val(),
         }
-        if(dept_select!='' && dept_select != 0){
-            data.appeal_dept = dept_select;
+        var hide = false;
+        if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
+            hide = true;
         }
         var cols = [
-                        {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        {width: 100, text: '任务名称', flex: false,colClass: '',field:'name'},
-                        {width: 80, text: '考核人员',  flex: false, colClass: '',field:'appeal_man_name'},
-                        {width: 100, text: '考核部门',  flex: false, colClass: '',sort: 'down',field:'appeal_dept_name'},
-                        {width: 80, text: '稽查人员', type: 'string', flex: false, colClass: '',field:'verify_person_name'},
-                        {width: 120, text: '稽查时间段', type: 'string',custom:'-24:00', flex: false, colClass: '',field:'start_time'},
-                        {width: 80, text: '状态', type: 'string', flex: false, colClass: '',field:'code_name'},
-                        {width: 120, text: '上次稽查时间', type: 'string', flex: false, colClass: '',field:'start_time'},
+                        // {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
+                        // {width: 100, text: '任务名称', flex: false,colClass: '',field:'name'},
+                        // {width: 80, text: '考核人员',  flex: false, colClass: '',field:'appeal_man_name'},
+                        // {width: 100, text: '考核部门',  flex: false, colClass: '',sort: 'down',field:'appeal_dept_name'},
+                        // {width: 80, text: '稽查人员', type: 'string', flex: false, hide:true,colClass: '',field:'verify_person_name'},
+                        // {width: 120, text: '稽查时间段', type: 'string', flex: false, colClass: '',field:'start_time'},
+                        // {width: 80, text: '状态', type: 'string', flex: false, colClass: '',field:'code_name'},
+                        // {width: 120, text: '上次稽查时间', type: 'string', flex: false, colClass: '',field:'start_time'},
+                        {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, 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,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: 100, text: '操作',  flex: false, colClass: '',field:'id',field_other:'task_id',oper:[
-                            {func:'seeCheckAudit',text:'查看稽查结果',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
+                            {func:'seeCheckAudit1',text:'查看稽查结果',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
                         ]},
                     ] ;
         
@@ -37,31 +141,8 @@ $(document).ready(function(){
                                 'param':data}
                                 );
     }
-    //条件查询
-    $("#conditional_query").click(function(){
-        queryTable();
-    })
-
-    getDeptList();
-    //初始化部门下拉框
-    function getDeptList(){
-        data ={}
-        post_common_service("dept/get/all", data, function(data){
-            $("#dept_select").empty();
-            $("#dept_select").append('<option value="">全部</option>');
-           
-            for(i=0;i<data.length;i++){
-                $("#dept_select").append('<option value="'+data[i].id+'">'+data[i].organname+'</option>');
-            }
-        }, function(){
-
-        });
-    }
-
-
-})
 //查看稽查结果
-function seeCheckAudit(id,task_id){
+function seeCheckAudit1(id,task_id){
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
@@ -78,4 +159,3 @@ function distributionAgain(id,task_id){
 function seeDetail(id,task_id){
     alert("task_id:"+task_id+"---id:"+id)
 }
-

VisualInspection/dist/js/assess_management/assess_way_edit.js

@@ -4,6 +4,9 @@
  var all_data = [] ;
  var check_rule_id ;
  var check_item_tree = null;
+
+var check_rule_tree = null ;
+
  var edittype = "add";
  var cols = [{
      width: 10,
@@ -39,7 +42,7 @@
      var zTreeObj;
      var zNodes = [];
      check_item_tree = $.fn.zTree.init($("#department_tree"), {}, zNodes);
-
+     check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), {}, zNodes);
      getCheckItems();
 
      $("#dept_add").on("click", function() {
@@ -311,6 +314,7 @@ function delete_check_item(id ){
              zdataItem.open = true ;
              all_data.push(zdataItem);
          }
+          check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), setting2, all_data)
      },function(error){})
 
  }
@@ -374,14 +378,18 @@ function loadData(nodedata) {
 
 
 function addCheckItem() {
-    //获取名称
-    var data = {
-        "rule_id": check_rule_id,
-        "id":dept_selectinput.value
+    //获取名称 所有已经勾选的
+    var nodedata = check_rule_tree.getCheckedNodes();
+    var datas = [] ;
+    for(var i=0;i< nodedata.length; i++ ){
+        if(nodedata[i].children.length >0 ){
+            continue;
+        }
+        datas.push({ "rule_id":check_rule_id,"id":nodedata[i].id });
     }
 
     if (edittype == "add") {
-        post_common_service( "checkRuleItem/add",data,function(data){
+        post_common_service( "checkRuleItem/add/list",datas,function(data){
             layer.msg('添加成功！', {
                 time: 2000, //20s后自动关闭
             }, function() {
@@ -402,4 +410,41 @@ function isSelfOrChild(id, node) {
         }
     }
     return false;
-}
+}
+
+
+var setting2 = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: true, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         },
+         callback: {
+           
+         },
+         edit: {
+             enable: true,
+             drag: {
+                 autoExpandTrigger: true,
+                 isMove: true,
+                 prev: false,
+                 next: true,
+                 inner: true,
+                 autoOpenTime: 0
+             },
+             showRenameBtn: false,
+             showRemoveBtn: false
+         }
+     };

VisualInspection/dist/js/config.js

@@ -2,5 +2,5 @@
 // var base_server_url = "http://10.112.0.236:8089/";
 var base_image_server_url = "http://10.112.0.236:8088/";
 
-var base_ui_url = "http://localhost:8080/";
-var base_server_url = "http://localhost:8089/";
+var base_ui_url = "http://192.168.68.126:8080/";
+var base_server_url = "http://192.168.68.126:8089/";

VisualInspection/dist/js/constant/constant.js

@@ -8,7 +8,7 @@ function queryConstant(){
                 {width: 80, text: '字典值', type: 'string', flex: false, field: 'code_value'},
                 {width: 80, text: '字典名称', type: 'string', flex: true, field: 'code_name'},
                 {width: 80, text: '有效标志', type: 'string', flex: false, field: 'valid'},
-                {width: 80, text: '代码标识', type: 'string', flex: true, field: 'code_flag'},
+                {width: 80, text: '字典标识', type: 'string', flex: true, field: 'code_flag'},
                 {width: 160, text: '标识名称', type: 'string', flex: false, field: 'flag_name'},
                 {width: 80, text: '备注', type: 'string', flex: true, field: 'remark'},
                 {width: 160, text: '操作', type: 'string', flex: true, field: 'id',

VisualInspection/dist/js/lib/mytable.js

@@ -28,8 +28,8 @@
         this.obj = this;
         $(element).html('');
         if(flag) return;
-        $(element).append('<div class="row"><div id="my_table" data-checkable="true" data-sortable="true"></div></div>'
-                           + '<div id="kkpager" class="row" style="text-align:center"></div>');
+        $(element).append('<div class=""><div id="my_table" data-checkable="true" data-sortable="true"></div></div>'
+                           + '<div id="kkpager" class="" style="text-align:center"></div>');
         this.getRemoteData(element,this.options,this);
         return this;       
     };
@@ -85,6 +85,13 @@
         },
         setTable:function(datas, element, options,p_cur) {
             var cols = options.cols;
+            var newCols = []
+            for(var i in cols) {
+                if(!cols[i].hide){
+                    newCols.push(cols[i]);
+                }
+            }
+            cols = newCols;
             var tableData = datas;
             // var pager = options.pager;
            
@@ -129,7 +136,7 @@
                         var oper = cols[i].oper;
                         var operStr="";
                         for(var j=0;j<oper.length;j++){
-                            operStr+='&nbsp;<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>'+oper[j].text+' </a>&nbsp;';
+                            operStr+='&nbsp;<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>&nbsp;'+oper[j].text+' </a>&nbsp;';
                         }
                         dArr.push(operStr);
                     }else{

VisualInspection/dist/js/main.js

@@ -146,6 +146,8 @@ function getPageInfo(id) {
 function changePage(url) {
     if (typeof (url) != "undefined") {
         CURRENT_PAGE_URL = url;
+        var page_params = GetQueryString(url);
+        $.zui.store.set("page_params", page_params);
         $("#main_content").load(base_ui_url + url);
 
         event = document.createEvent('MessageEvent');
@@ -153,4 +155,18 @@ function changePage(url) {
         event.initMessageEvent('changepage', true, true, CURRENT_PAGE_URL, origin, 1234, window, null);
         document.dispatchEvent(event);
     }
+}
+
+
+function GetQueryString(url)
+{
+     var theRequest = new Object();
+     if (url.indexOf("?") != -1) {
+        var str = url.split("?")[1];
+        strs = str.split("&");
+        for(var i = 0; i < strs.length; i ++) {
+            theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+        }
+     }
+     return theRequest;
 }

VisualInspection/dist/js/mytask/check.js

@@ -1,13 +1,26 @@
 function initCheck() {
+    $('#ex1').slider();
+    $("#ex1").on("slideStop", function(slideEvt) {
+        setVideoProcess(slideEvt.value);
+    });
+    // setProcessValue(600);
+    // $("#ex1").on("click", function(slideEvt) {
+    //     setVideoProcess(slideEvt.value);
+    // });
+
+    // $("#ex1").on("slideStop", function(slideEvt) {
+    //     setProcessValue(slideEvt.value);
+    // });
+    setProcessValue(300);
+    // setCurrentProcessValue(50);
+
+    // setCurrentProcessValue(60);
+
     event = document.createEvent('MessageEvent');
     var origin = window.location.protocol + '//' + window.location.host;
     event.initMessageEvent('setvideoposition', true, true, getVideoPosition(), origin, 1234, window, null);
     document.dispatchEvent(event);
 
-    $('#ex1').slider();
-    $("#ex1").on("slideStop", function(slideEvt) {
-        setProcessValue(slideEvt.value);
-    });
 
     // 仅选择日期
     $("#start-time").datetimepicker({
@@ -34,7 +47,7 @@ function initCheck() {
         format: "yyyy-mm-dd"
     });
     if ($.checkTask) {
-        setFeSelect("#fsList", $.checkTask.deptid);
+        setFeSelect("#fsList", $.checkTask.checked_dept);
         setLaneSelect("#lane", $.checkTask.checked_location);
         get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function (data) {
             changePersonContent(data);
@@ -93,7 +106,7 @@ function showEditScore(id) {
 }
 
 function deleteScore(id) {
-    deleteItem4Common(id, "/score/delete/", queryScores);
+    deleteItem4Common(id, "/score/delete/", queryScores, 'r');
 }
 
 function setVideoList(videos){
@@ -156,16 +169,16 @@ function clearAllImg() {
 var changePersonLayer;
 function showChangeUser() {
     var param = {
-        'organid': $.checkTask.dept_id
+        'organid': $.checkTask.checked_dept
     };
    
     post_common_service("/user/getUserList/", param, function (data) {
-        changePersonLayer = showPopup4Common('更改人员', null, '800px');
+        changePersonLayer = showPopup4Common('更改人员', null, '800px',null,'r');
         $("#user_container").empty();
         var userStr = "";
         for (var i in data) {
             var name = data[i].truename;
-            if (data[i].workno) name = data[i].workno + " " + name;
+            if (data[i].workno) name = name+" "+data[i].workno;
             var pic = "../../images/body-bg.png";
             if (data[i].pic) pic = data[i].pic;
             str = '<div style="width:100px;float:left;margin:5px;">'
@@ -183,10 +196,17 @@ function showChangeUser() {
 
 function changePerson(id) {
     // $('#checked_person').html(id);
-    get_common_service('user/getUserById/' + id, null, function (data) {
+    var param = {"id": $.checkTask.id,
+                 "checked_person": id,
+                }
+    no_return_common_service("task/update/", param, function(data) {
+        get_common_service('user/getUserById/' + id, null, function (data) {
         changePersonContent(data);
     })
     layer.close(changePersonLayer);
+    }, function(error) {
+        alert(error);
+    });  
 }
 
 function changePersonContent(data) {
@@ -199,7 +219,7 @@ function changePersonContent(data) {
 }
 var scoreLayer;
 function showScore() {
-    scoreLayer = showPopup4Common('选择考核项', null, ['400px', '500px'], '#items-div');
+    scoreLayer = showPopup4Common('选择考核项', null, ['400px', '500px'], '#items-div','r');
     buildTree();
 }
 function buildTree() {
@@ -363,7 +383,7 @@ function showPre(id) {
 function showInvalid() {
     invalidLayer = showPopup4Common('申请无效', function () {
         saveValidReason();
-    }, ['400px', '500px'], '#invalid_div');
+    }, ['400px', '500px'], '#invalid_div','r');
 
 }
 function saveValidReason() {

VisualInspection/dist/js/mytask/checked.js

@@ -13,11 +13,11 @@ function queryCheckedTask(){
                 {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: 'start_time'},
-                {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_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:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}
                     ]
                 }
             ];

VisualInspection/dist/js/mytask/task_list.js

@@ -0,0 +1,192 @@
+var cur_status;
+function initTaskPage() {
+    initQueryParams();
+    initTableRowBtn();
+    queryTask();
+}
+function initQueryParams() {
+    // 仅选择日期
+    $("#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;
+    }
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_2",[{func:'showCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_3",[{func:'showContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_4",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
+                                        {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}]);
+    $.zui.store.set("task_table_btn_5",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_6",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_21",[{func:'showApplyDetail',text:'处理',icon_class:'icon-hand-up'}]);
+}
+//查询任务
+function queryTask(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "checked_dept": $("#fsList").val(),
+        "check_status":cur_status
+    }
+    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: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'}
+            ];
+    var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   
+    colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);
+    cols.push(colFunc);
+    // 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'));
+    no_return_common_service('/task/update', {"id":id,"check_status":3})
+    changePage("/view/mytask/check.html");
+}
+//进入继续稽查页面
+function showContinueCheck(id){
+    // $('#myModal').modal({name:"dd"});
+    $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    changePage("/view/mytask/check.html");
+}
+//处置无效任务申请
+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',queryTask);
+}
+//拒绝申请
+function refuseApply(taskId){
+     var param = {
+        'id':$('#apply_id').val(),
+        'task_id':taskId
+    };
+    addOrUpdateItem4Common(param,'/checkApply/refuse',queryTask);
+}
+//任务详情页面
+function showTaskDetail(id){
+    var rowData=getItemByIdFromArr(id,$('.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){
+            queryTask();
+            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){
+            queryTask();
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
+        });
+    }, function(index){
+        layer.close(index);
+    });
+    
+}

VisualInspection/js/mytask/unchecked.js → VisualInspection/dist/js/mytask/unchecked1111111.js

@@ -13,7 +13,7 @@ function queryUncheckedTask(){
                 {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, colClass: '',field: 'check_status_name'},
                 {width: 100, text: '操作', type: 'string', flex: true, field: 'id',
                     oper:[
                         {func:'showCheck',text:'稽查',icon_class:'icon-eye-open'}
@@ -50,7 +50,7 @@ function queryUnexaminedTask(){
                 {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: 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'}
@@ -128,10 +128,10 @@ function queryUndispatchedTask(){
                 {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: 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:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
                         {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}
                     ]
                 }
@@ -212,10 +212,10 @@ function queryDispatchedTask(){
                 {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: 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'}
+                        {func:'showTaskDetail1',text:'详情',icon_class:'icon-tasks'}
                     ]
                 }
             ];
@@ -233,4 +233,86 @@ 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/undispatched.js → VisualInspection/dist/js/mytask/undispatched111.js

@@ -12,7 +12,7 @@ function queryUndispatchedTask(){
                 {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: 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'}

VisualInspection/dist/js/teamClass/charge_team_schedule.js

@@ -101,10 +101,10 @@
                     //     $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
                     // }
                     for(var i=0;i<entrance_number;i++){
-                        $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
+                        $(".thread_charge").append("<th>入口"+(i+1)+"</th>");
                     }
                     for(var i=0;i<exit_number;i++){
-                         $(".thread_charge").append("<th>出口车道"+(i+1)+"</th>");
+                         $(".thread_charge").append("<th>出口"+(i+1)+"</th>");
                     }
                 }
             },function(error){
@@ -262,7 +262,7 @@
                              $(".tr-1").append("<td>"+ classCode["1"].class_name +" "+classCode["1"].start_time+" - "+classCode["1"].end_time +"</td>");
                             var selectv = "<select class='form-control'>"
                                     // console.log(data[i]);
-                            selectv += ("<option value=''>请选择人员</option>");
+                            selectv += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                     var obj = data[i].users[j];
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
@@ -285,7 +285,7 @@
                             $(".tr-2").append("<td>"+ classCode[2].class_name +" "+classCode[2].start_time+" - "+classCode[2].end_time +"</td>");
                               $(".tr-2").data("cache",data[i]);
                             var selectv2 = "<select class='form-control'>"
-                            selectv2 += ("<option value=''>请选择人员</option>");
+                            selectv2 += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv2 += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>")
@@ -307,7 +307,7 @@
                              $(".tr-3").append("<td>"+ classCode[3].class_name +" "+classCode[3].start_time+" - "+classCode[3].end_time +"</td>");
                              $(".tr-3").data("cache",data[i]);
                             var selectv3 = "<select class='form-control'>"
-                            selectv3 += ("<option value=''>请选择人员</option>");
+                            selectv3 += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv3 += "<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>"

VisualInspection/dist/js/teamClass/check_team_schedule.js

@@ -3,8 +3,10 @@
 
          $("#main_content_title").html("稽查人员排班")
 
+        var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+        // console.log(user );
         // 用户的dept_id
-        var user_dept_id = '' ;
+        var user_dept_id = user.organid ;
         
         // 稽查小组type
         var team_type = 2 ;
@@ -12,8 +14,7 @@
         // 日期游标
         var date_cursor = 0 ;
 
-        // var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
-        // console.log(user );
+
 
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
@@ -107,7 +108,7 @@
             setAddTermTitle(date.format("yyyy-MM-dd"));
             // 保存当前日期
             $("#save_term_class").data("date",date.format("yyyy-MM-dd"));
-
+             $("#team_detail").html("");
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":date.format("yyyy-MM-dd 00:00:00"),
@@ -124,6 +125,7 @@
                     for(var i=0;i<data.length;i++){
                         $(".class_team_"+data[i].class_type).val(data[i].team_id);
                     }
+                    $("#team_detail").html(data[0].user_ids_name);
                 }else{
                      $("#save_term_class").data("modify_flag",0);
                 }
@@ -179,7 +181,8 @@
                         "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
+                        "dept_id": user_dept_id,
+                        "user_ids":  $("#team_detail").data("user_ids")      
                     };
                     data.push(obj);
                 }
@@ -227,6 +230,19 @@
 
    })
 
+   $("#all_term").change(function(){
+       if($(this).val() !="" ){
+           // 请求班组下人员信息
+           var data ={ "id": $(this).val() };
+           post_common_service( "team/getDetailById",data,function(data){
+                $("#team_detail").html(data.user_ids_name); 
+                $("#team_detail").data("user_ids",data.user_ids);            
+           },function(error){})
+       }else{
+            $("#team_detail").html("");   
+       }
+   })
+
    // 根据class_type 获取班次名称
    function getTeamName(class_type){
        if(class_type == 1){

VisualInspection/dist/js/term_management/charge_terms_m.js

@@ -15,18 +15,18 @@
         }
         var cols = [
                         {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        {width: 100, text: '班组名称', flex: false,colClass: '',field:'name'},
-                        {width: 80, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(obj){
+                        {width: 50, text: '班组名称', flex: false,colClass: '',field:'name'},
+                        {width: 50, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(obj){
                             if(obj==1){
                                 return "收费人员";
                             }else if(obj == 2){
                                 return "稽查人员";
                             }
                         }},
-                        {width: 80, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
-                        {width: 80, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
-                        {width: 120, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
-                        {width: 50, text: '操作',  flex: false, colClass: '',field:'id',oper:[
+                        {width: 50, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
+                        {width: 50, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
+                        {width: 200, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
+                        {width: 80, text: '操作',  flex: false, colClass: '',field:'id',oper:[
                             {func:'updateCheckTeam',text:'修改',icon_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',icon_class:'icon-remove-circle'}
                         ]},
                     ] ;

VisualInspection/dist/js/term_management/check_terms_m.js

@@ -15,7 +15,7 @@
         }
         var cols = [
                         {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        {width: 100, text: '班组名称', flex: false,colClass: '',field:'name'},
+                        {width: 70, text: '班组名称', flex: false,colClass: '',field:'name'},
                         {width: 80, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(obj){
                             if(obj==1){
                                 return "收费人员";
@@ -23,9 +23,9 @@
                                 return "稽查人员";
                             }
                         }},
-                        {width: 80, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
-                        {width: 80, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
-                        {width: 120, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
+                        {width: 40, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
+                        {width: 40, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
+                        {width: 200, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
                         {width: 50, text: '操作',  flex: false, colClass: '',field:'id',oper:[
                             {func:'updateCheckTeam',text:'修改',icon_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',icon_class:'icon-remove-circle'}
                         ]},

VisualInspection/dist/js/user/addUser.js

@@ -50,7 +50,7 @@ function resetform() {
     $("#user_workno").val("");
     $("#user_password").val("");
     $("#user_confirm_password").val("")
-    $("#user_birth").val("")
+    // $("#user_birth").val("")
     $("#user_mobile").val("")
     $("#user_position").val("")
     $("#user_idno").val("")
@@ -68,11 +68,15 @@ function initUserInfo() {
     $("#user_workno").val(usertemp.workno);
     $("#user_password").val(usertemp.password);
     $("#user_confirm_password").val(usertemp.password)
-    $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
+    // $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
     $("#user_mobile").val(usertemp.mobile)
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
     $("#user_email").val(usertemp.email)
+    
+    $("#user_img_pre2").html("")
+    $("#user_img_add").removeClass("hide");
+    $("#user_img_pre").addClass("hide");
     if (typeof (usertemp.pic) != "undefinde" && usertemp.pic != null) {
         $("#user_img_pre").removeClass("hide");
         $("#user_img_add").addClass("hide");
@@ -92,7 +96,7 @@ function initUserInfo() {
         });
         $img0.attr("src", "/js/lib/imageupload/img/a7.png").appendTo($section);
         var $img = $("<img class='up-img up-opcity' id='user_pic'>");
-        $img.attr("src", base_server_url + usertemp.pic);
+        $img.attr("src", usertemp.pic);
         $img.appendTo($section);
         var $p = $("<p class='img-name-p'>");
         $p.html("image").appendTo($section);
@@ -134,7 +138,7 @@ function addUser() {
     var usermobile = $("#user_mobile").val();
     var useridno = $("#user_idno").val();
     var useremail = $("#user_email").val();
-    var userbirth = $("#user_birth").val();
+    // var userbirth = $("#user_birth").val();
     var userposition = $("#user_position").val();
     var usertruename = $("#user_true_name").val();
     var userroles = role_selectinput.getSelectedItemsId();

VisualInspection/dist/js/util/const.js

@@ -20,9 +20,21 @@ var DEPT_ADD = "dept/addDept"
 var DEPT_EDIT = "dept/updateDept/"
 var DEPT_DELETE = "/dept/deleteDept/"
 
+
+// 权限
+var PERMISION_GET_ALL = "/permission/get/all"
+var PERMISION_DELETE = "/permission/deletePermission/"
+var PERMISION_UPDATE = "/permission/updatePermission/"
+var PERMISION_ADD = "/permission/addPermission"
+
+
+
 //角色
 var ROLE_GET_ALL = "/role/get/all/"
 var ROLE_GET_ALL_DATA = "/role/get/alldata/"
+var ROLE_GET_BY_PERMISION = "/role/getRoleByPermision/"
+
+
 
 
 
@@ -30,4 +42,10 @@ var ROLE_GET_ALL_DATA = "/role/get/alldata/"
 var FILE_UPLOAD = "/file/upload"
 
 
-var CURRENT_PAGE_URL="-1";
+var CURRENT_PAGE_URL="-1";
+
+var ROLE_JICHA_ADMIN="ROLE_JICHA_ADMIN";
+var ROLE_STATION_ADMIN="ROLE_STATION_ADMIN";
+var ROLE_STATION="ROLE_STATION";
+var ROLE_JICHA="ROLE_JICHA";
+var ROLE_MANAGER="ROLE_MANAGER";

VisualInspection/dist/js/util/service.js

@@ -103,6 +103,67 @@ function MenuGetAll(success, fail) {
     });
 }
 
+function PermisionGetAll(success, fail) {
+    var url = base_server_url + PERMISION_GET_ALL
+    ajaxGet(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
+function PermisionAdd(data,success, fail) {
+    var url = base_server_url + PermisionAdd
+    ajaxPost(url, data, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+function PermisionEdit(data,success, fail) {
+    var url = base_server_url + PermisionEdit+data.id
+    ajaxPut(url, data, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+function PermisionDelete(success, fail) {
+    var url = base_server_url + PermisionDelete
+    ajaxDelete(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
+
+
+
 function DeptGetAll(success, fail) {
     var url = base_server_url + DEPT_GET_ALL
     ajaxGet(url, "", function(response) {
@@ -262,6 +323,21 @@ function RoleGetALLNoData(success, fail) {
     });
 }
 
+function RoleGetByPermision(permisionid,success, fail) {
+    var url = base_server_url + ROLE_GET_BY_PERMISION+permisionid;
+    ajaxGet(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
 function RoleGetALL(page,size, success, fail) {
     var url = base_server_url + ROLE_GET_ALL_DATA+"/"+page+"/"+size;
     ajaxGet(url, "", function(response) {

VisualInspection/dist/js/util/util.js

@@ -109,9 +109,10 @@ function getItemByIdFromArr(id,curDatas){
     return rowData;
 }
 
-function showPopup4Common(title,callback,area,divId){
+function showPopup4Common(title,callback,area,divId,offset){
     if(!area) area='auto';
     if(!divId) divId='#form-div';
+    if(!offset) offset='auto';
     //添加常量页面
     return layer.open({
         type: 1,
@@ -119,7 +120,7 @@ function showPopup4Common(title,callback,area,divId){
         title: title,
         closeBtn: 1,
         shadeClose: true,
-        offset: 'r',
+        offset: offset,
         skin: 'layui-layer-lan',
         content: $(divId),
         btn: '保存',
@@ -135,10 +136,12 @@ function showPopup4Common(title,callback,area,divId){
 }
 
 
-function deleteItem4Common(id,url,okCb){
+function deleteItem4Common(id,url,okCb,offset){
+    if(!offset) offset='auto';
     //询问框
     layer.confirm('确定删除记录？', {
-        btn: ['删除','取消'] //按钮
+        btn: ['删除','取消'], //按钮
+        offset:offset
     }, function(){
         var param ={"id":id};
         no_return_common_service(url, param, function(data) {
@@ -154,6 +157,7 @@ function deleteItem4Common(id,url,okCb){
     });
 }
 
+
 function addOrUpdateItem4Common(param,url,okCb){
     no_return_common_service(url, param, function(data) {
         if(okCb) okCb();//重新加载表格数据
@@ -261,7 +265,6 @@ function showPopup4CommonBtns(title,area,divId,btns,callback1,callback2){
         title: title,
         closeBtn: 1,
         shadeClose: true,
-        skin: 'layui-layer-lan',
         content: $(divId),
         btn: btns,
         btnAlign: 'c', //按钮居中
@@ -273,4 +276,18 @@ function showPopup4CommonBtns(title,area,divId,btns,callback1,callback2){
             layer.close(index);
         }
     });
+}
+
+function getCurrentUser() {
+    var user = $.zui.store.get("user")
+    return user;
+}
+
+function hasRole(role){
+    var user = getCurrentUser();
+    var roles = user.roles;
+    for(var i in roles){
+        if(roles[i].name==role) return true;
+    }
+    return false;
 }

VisualInspection/dist/js/util/video.js

@@ -22,7 +22,7 @@ function queryVideoList(){
         s1 = $.checkTask.end_time.replace(/-/g,"/");
         var endTime = new Date(s1).getTime()/1000;
         // alert(curVideo);
-        var str = curVideo+'|'+startTime+'|'+endTime;
+        var str = 120+'|'+startTime+'|'+endTime;
         callFunc("findvideolist",str);
     }else{
 
@@ -32,15 +32,26 @@ function queryVideoList(){
 function playVideo(id){
     callFunc("playvideo", id);
 }
+var maxVV;
+function setProcessValue(maxValue){
+    // alert(maxValue);
+    // console.log(max);
+    maxVV = maxValue;
+    $("#ex1").slider({step: 5, min: 0, max: maxValue});
+}
 
-function setProcessValue(max){
-    console.log(value);
-    $("#ex11").slider({step: 5, min: 0, max: max});
+function setCurrentProcessValue(value){
+    // alert("ddd"+value);
+    // console.log(value);
+    
+    var vv =maxVV*(value/100)
+    $("#ex1").slider('setValue',parseInt(vv));
 }
 
 function setVideoProcess(value){
-    console.log(value);
-    callFunc("playvideo", id);
+    // console.log(value);
+    var vv = value*100/maxVV;
+    callFunc("setcurrenplayttime", parseInt(vv));
 }
 
 function callFunc(func, param){

VisualInspection/dist/view/appeal_management/appealDetail.html

@@ -3,12 +3,13 @@
         <input type="hidden" class="form-control" id="apply_id" disabled="disabled" placeholder="">
        
         <div class="form-group">
-            <label class="col-md-4 col-sm-2">申诉原因</label>
-            <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="appeal_reason" placeholder="">
+            <label class="col-md-2">申诉原因：</label>
+            <div class="col-md-10">
+                <!--<input type="text" class="form-control" id="appeal_reason" placeholder="">-->
+                <textarea class="col-md-12" id="appeal_reason" style="height:200px;"></textarea>
             </div>
         </div>
-        <!--<div class="form-group">
+        <div class="form-group">
             <label class="col-md-4 col-sm-2">申诉附件</label>
             <div class="col-md-6 col-sm-10">
                 <div id="uploader" class="wu-example">
@@ -19,7 +20,7 @@
                     </div>
                 </div>
             </div>
-        </div>-->
+        </div>
     </form>
 </div>
 <script>

VisualInspection/dist/view/appeal_management/appeal_list.html

@@ -18,7 +18,7 @@
                         </select>
                     </div>
                     <div class="col-sm-2">
-                        <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+                        <button class="btn btn-primary " type="button" id="conditional_query" onclick="queryAppeal()">查询</button>
                     </div>
                 </div>
             </form>
@@ -36,48 +36,7 @@
 
 <script type="text/javascript">
      $(document).ready(function() {
-
-        // 时间和日期
-       $(".form-date").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 2,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-
-         // 使用data参数更新数据：
-        // $('.datatable').datatable( {
-        //     checkable:false,
-        //     sortable:false,
-        //     data: {
-        //         cols: [
-        //             {width: 30, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
-        //             {width: 100, text: '任务名称', type: 'date', flex: false, sort: 'down'},
-        //             {width: 80, text: '考核人员', type: 'string', flex: true, colClass: ''},
-        //              {width: 80, text: '考核部门', type: 'date', flex: false, sort: 'down'},
-        //             {width: 80, text: '稽查人员', type: 'date', flex: false, sort: 'down'},
-        //             {width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: ''},
-        //             {width: 80, text: '状态', type: 'date', flex: false, sort: 'down'},
-        //             {width: 100, text: '上次稽查时间', type: 'string', flex: true, colClass: ''},
-        //             {width: 100, text: '操作', type: 'string', flex: true, colClass: ''},
-        //         ],
-        //         rows: [
-        //             {checked: false, data: [1, '20170404收费站稽查任务','李明','收费站','王佳佳','2017-04-04 00:00-23:59','申诉中','2017-04-05 12:30','<a href="#"> 查看稽查结果</a> <a href="#"> 再分配</a>']},
-        //             {checked: false, data: [1, '20170404收费站稽查任务','李明','收费站','王佳佳','2017-04-04 00:00-23:59','申诉中','2017-04-05 12:30','<a href="#"> 查看稽查结果</a> <a href="#"> 再分配</a>']},
-        //             {checked: false, data: [1, '20170404收费站稽查任务','李明','收费站','王佳佳','2017-04-04 00:00-23:59','申诉中','2017-04-05 12:30','<a href="#"> 查看稽查结果</a> <a href="#"> 再分配</a>']},
-        //             {checked: false, data: [1, '20170404收费站稽查任务','李明','收费站','王佳佳','2017-04-04 00:00-23:59','申诉中','2017-04-05 12:30','<a href="#"> 查看稽查结果</a> <a href="#"> 再分配</a>']},
-        //             {checked: false, data: [1, '20170404收费站稽查任务','李明','收费站','王佳佳','2017-04-04 00:00-23:59','申诉中','2017-04-05 12:30','<a href="#"> 查看稽查结果</a> <a href="#"> 再分配</a>']},
-        //             {checked: false, data: [1, '20170404收费站稽查任务','李明','收费站','王佳佳','2017-04-04 00:00-23:59','申诉中','2017-04-05 12:30','<a href="#"> 查看稽查结果</a> <a href="#"> 再分配</a>']},
-        //             {checked: false, data: [1, '20170404收费站稽查任务','李明','收费站','王佳佳','2017-04-04 00:00-23:59','申诉中','2017-04-05 12:30','<a href="#"> 查看稽查结果</a> <a href="#"> 再分配</a>']},
-        //         ]
-        //     }
-        // });
+        initAppealPage();
     })
 </script>
 

VisualInspection/dist/view/appeal_management/unassign_appeal.html

@@ -0,0 +1,88 @@
+<script src="/js/appeal_management/appeal_list.js?_inline"></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;">
+    <div class="container-fluid ">
+    <form class="form-horizontal" style="margin-top:10px;">
+        <input type="hidden" class="form-control" id="apply_id" disabled="disabled" placeholder="">
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">申请人</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_man" disabled="disabled" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">申请时间</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_time" disabled="disabled" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">原因</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_reason" disabled="disabled" placeholder="">
+            </div>
+        </div>
+    </form>
+</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");
+        queryUndispatchedTask();
+    });
+</script>

VisualInspection/dist/view/assess_management/assess_way_edit.html

@@ -89,6 +89,9 @@ span.comboTreeItemTitle{
  var all_data = [] ;
  var check_rule_id ;
  var check_item_tree = null;
+
+var check_rule_tree = null ;
+
  var edittype = "add";
  var cols = [{
      width: 10,
@@ -124,7 +127,7 @@ span.comboTreeItemTitle{
      var zTreeObj;
      var zNodes = [];
      check_item_tree = $.fn.zTree.init($("#department_tree"), {}, zNodes);
-
+     check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), {}, zNodes);
      getCheckItems();
 
      $("#dept_add").on("click", function() {
@@ -396,6 +399,7 @@ function delete_check_item(id ){
              zdataItem.open = true ;
              all_data.push(zdataItem);
          }
+          check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), setting2, all_data)
      },function(error){})
 
  }
@@ -459,14 +463,18 @@ function loadData(nodedata) {
 
 
 function addCheckItem() {
-    //获取名称
-    var data = {
-        "rule_id": check_rule_id,
-        "id":dept_selectinput.value
+    //获取名称 所有已经勾选的
+    var nodedata = check_rule_tree.getCheckedNodes();
+    var datas = [] ;
+    for(var i=0;i< nodedata.length; i++ ){
+        if(nodedata[i].children.length >0 ){
+            continue;
+        }
+        datas.push({ "rule_id":check_rule_id,"id":nodedata[i].id });
     }
 
     if (edittype == "add") {
-        post_common_service( "checkRuleItem/add",data,function(data){
+        post_common_service( "checkRuleItem/add/list",datas,function(data){
             layer.msg('添加成功！', {
                 time: 2000, //20s后自动关闭
             }, function() {
@@ -487,7 +495,44 @@ function isSelfOrChild(id, node) {
         }
     }
     return false;
-}</script>
+}
+
+
+var setting2 = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: true, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         },
+         callback: {
+           
+         },
+         edit: {
+             enable: true,
+             drag: {
+                 autoExpandTrigger: true,
+                 isMove: true,
+                 prev: false,
+                 next: true,
+                 inner: true,
+                 autoOpenTime: 0
+             },
+             showRenameBtn: false,
+             showRemoveBtn: false
+         }
+     };</script>
 <div class="container-fluid ">
     <div id="dashboard" class="dashboard dashboard-draggable" data-height="500">
         <div class="row" style="text-align:center;margin-bottom:10px;font-size:20px;">
@@ -539,28 +584,23 @@ function isSelfOrChild(id, node) {
             <div class="modal-body">
                 <div class="container-fluid ">
                     <form class="form-horizontal">
-                        <!--<div class="form-group">
-                            <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
-                            <div class="col-md-6 col-sm-10">
-                                <input type="text" id="check_item_name" class="form-control" placeholder="名称">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="exampleInputAccount4" class="col-sm-2">分数：</label>
-                            <div class="col-md-6 col-sm-10">
-                                <input type="text" id="check_item_score" class="form-control" placeholder="分数">
-                            </div>
-                        </div>-->
-                        <div class="form-group check_item_group">
+                        
+                        <!--<div class="form-group check_item_group">
                             <label for="exampleInputPassword4" class="col-sm-3">考核项名称：</label>
                             <div class="col-md-6 col-sm-9">
                                 <div id="check_item_select"></div>
+                            </div>
+                        </div>-->
 
+                        <div class="form-group check_item_group" >
+                            <div class="col-sm-offset-1 col-md-11 col-sm-11" style="height:320px;overflow:auto;" >
+                                <ul id="check_rule_tree" class="ztree">
+                                </ul>
                             </div>
                         </div>
 
                         <div class="form-group">
-                            <div class="col-sm-offset-3 col-sm-10">
+                            <div class="col-sm-offset-2 col-sm-10">
                                 <button type="button" id="add_btn" class="btn btn-default" onclick="addCheckItem()">添加</button>
                             </div>
                         </div>

VisualInspection/dist/view/mytask/changePerson.html

@@ -1,5 +1,5 @@
 <div class="container-fluid ">
-        <div class="cards" id="user_container">
+        <div class="cards" id="user_container" style="height:400px;overflow:auto;">
              <div style="width:200px;">
                 <a class="card" href="###">
                     <img src="../../image/img4.jpg" alt="">

VisualInspection/dist/view/mytask/check.html

@@ -13,12 +13,12 @@
                     <select class="form-control" id="lane" disabled="disabled"></select>
                 </div>
                 <label class="col-sm-1">考核人员</label>
-                <div class="col-sm-2">
+                <div class="col-sm-3">
                     <!-- 使用图片 -->
-                    <a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle"><img src="/images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;"></a>
+                    <a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle"><img src="/images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>
                     <label id="checked_person"></label>
                 </div>
-                <div class="col-sm-2">
+                <div class="col-sm-1">
                     <button class="btn btn-primary " type="button" onclick="showChangeUser()">更改考核人员</button>
                 </div>
             </div>
@@ -50,14 +50,14 @@
                             <div class="tab-pane" id="tabContent3" class="col-sm-12">
                             </div>
                         </div>
-                        <div class="row" class="col-md-12" style="padding:5px;margin-top:5px;text-align:center">
+                        <div class="row" class="col-md-12" style="padding:5px;margin-top:30px;text-align:center">
                             <input id="ex1" class="col-md-12"  type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="0"/>
                         </div>
                         <div class="row" style="padding:0 10px;margin-top:5px;text-align:center">
                             <select class="form-control" id="video_list" style="width:200px;float:left;"></select>
                             <div class="btn-group" style="float:right;">
-                                <button type="button" class="btn btn-info" onclick="doAction('start')"><i class="icon icon-play-circle icon-2x"></i></button>
-                                <button type="button" class="btn btn-info" onclick="doAction('stop')"><i class="icon icon-pause icon-2x"></i></button>
+                                <button type="button" class="btn btn-info" onclick="setCurrentProcessValue(90)"><i class="icon icon-play-circle icon-2x"></i></button>
+                                <button type="button" class="btn btn-info" onclick="setCurrentProcessValue(70)"><i class="icon icon-pause icon-2x"></i></button>
                                 <button type="button" class="btn btn-info" onclick="doAction('fast')"><i class="icon icon-forward icon-2x"></i></button>
                                 <button type="button" class="btn btn-info" onclick="doAction('slow')"><i class="icon icon-backward icon-2x"></i></button>
                                 <button type="button" class="btn btn-success" onclick="doAction('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
@@ -114,7 +114,7 @@
 </div>
 <div id="form-div" style="display:none;text-align:center;">
     <div class="container-fluid ">
-        <div class="cards" id="user_container">
+        <div class="cards" id="user_container" style="height:400px;overflow:auto;">
              <div style="width:200px;">
                 <a class="card" href="###">
                     <img src="../../image/img4.jpg" alt="">

VisualInspection/dist/view/mytask/confirmed11.html

@@ -0,0 +1,91 @@
+<!--<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;">
+    <div class="container-fluid ">
+    <form class="form-horizontal" style="margin-top:10px;">
+        <input type="hidden" class="form-control" id="apply_id" disabled="disabled" placeholder="">
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">申请人</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_man" disabled="disabled" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">申请时间</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_time" disabled="disabled" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">原因</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_reason" disabled="disabled" placeholder="">
+            </div>
+        </div>
+    </form>
+</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"
+        });
+        if(hasRole(ROLE_STATION_ADMIN)){
+            var user = getCurrentUser();
+            setFeSelect("#fsList",user.organid);
+            $("#fsList").attr("disabled","disabled"); 
+        }else{
+            setFeSelect("#fsList");
+        }
+        queryConfirmedTask();
+    });
+</script>

VisualInspection/dist/view/mytask/dispatched.html → VisualInspection/dist/view/mytask/dispatched11.html

@@ -79,7 +79,13 @@
             forceParse: 0,
             format: "yyyy-mm-dd"
         });
-        setFeSelect("#fsList");
+        if(hasRole(ROLE_STATION_ADMIN)){
+            var user = getCurrentUser();
+            setFeSelect("#fsList",user.organid);
+            $("#fsList").attr("disabled","disabled"); 
+        }else{
+            setFeSelect("#fsList");
+        }
         queryDispatchedTask();
     });
 </script>

VisualInspection/dist/view/mytask/taskDetail.html

@@ -2,18 +2,19 @@
 <div class="container-fluid ">
       <div class="row">
         <h3>考核基本信息</h3>
-        <div class="page-header">
+        <div>
             <table style="width:100%;">
                 <tr>
                     <td width="20%">考核任务名：<label id="name"></label></td>
-                    <td width="20%">考核人：<label id="checkman"></label></td>
+                    <!--<td width="20%">考核人：<label id="checkman"></label></td>-->
                     <td width="20%">考核时间： <label id="checktime"></label></td>
-                    <td width="20%">被考核人：<label id="checked_person"></label></td>
-                    <td width="20%">被考核部门：<label id="checked_dept"></label></td>
+                    <td width="20%">考核人：<label id="checked_person"></label></td>
+                    <td width="20%">考核部门：<label id="checked_dept"></label></td>
                 </tr>
             </table>
         </div>
       </div>
+      <hr>
       <div class="row">
         <h3>考核任务流程</h3>
         <div id="flow_div">
@@ -25,13 +26,27 @@
         <div>
             <div id="score_datatable" data-checkable="true" data-sortable="true"></div>
         </div>
+    </div>
+    <hr>
+    <div class="row" id="appeal_div">
+        <h3>申诉基本信息</h3>
+        <div>
+            <table style="width:100%;">
+                <tr>
+                    <td width="20%">申诉时间：<label id="appeal_time"></label></td>
+                    <td width="20%">申诉原因：<label id="appeal_reason"></label></td>
+                </tr>
+                <tr>
+                    <td width="20%">附件：<label id="files"></label></td>
+                </tr>
+            </table>
+        </div>
       </div>
     <div class="row" style="margin-top:5px;text-align:center">
-        <div class="btn-group">
-            <button type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
-        </div>
-        <div class="btn-group">
-            <button type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
+        <div>
+            <button id="submitBtn" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
+            <button id="confirmBtn" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
+            <button id="appealBtn" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
         </div>
     </div>
 </div>
@@ -47,12 +62,13 @@
         <input type="hidden" class="form-control" id="apply_id" disabled="disabled" placeholder="">
        
         <div class="form-group">
-            <label class="col-md-4 col-sm-2">申诉原因</label>
-            <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="appeal_reason" placeholder="">
+            <label class="col-md-2">申诉原因：</label>
+            <div class="col-md-10">
+                <!--<input type="text" class="form-control" id="appeal_reason" placeholder="">-->
+                <textarea class="col-md-12" id="appeal_reason" style="height:200px;"></textarea>
             </div>
         </div>
-        <!--<div class="form-group">
+        <div class="form-group">
             <label class="col-md-4 col-sm-2">申诉附件</label>
             <div class="col-md-6 col-sm-10">
                 <div id="uploader" class="wu-example">
@@ -63,7 +79,7 @@
                     </div>
                 </div>
             </div>
-        </div>-->
+        </div>
     </form>
 </div>
 <script>
@@ -109,35 +125,63 @@
 </style>
 <script>
     $(document).ready(function() {
+        checkAuth();
         $("#name").html($.checkTask.name);
         $("#checkman").html($.checkTask.checkman_name);
         $("#checktime").html($.checkTask.start_time);
         $("#checked_person").html($.checkTask.checked_person_name);
         $("#checked_dept").html($.checkTask.checked_dept_name);
 
+        if($.checkTask.appeal) {
+            $("#appeal_div").show();
+            $("#appeal_time").html($.checkTask.appeal_time);
+            $("#appeal_reason").html($.checkTask.appeal_reason);
+        }else{
+            $("#appeal_div").hide();
+        }
+
         genFlow();
         queryScores();
        
         $('a.lightbox-toggle').lightbox();
     });
+
+    function checkAuth(){
+        if(hasRole(ROLE_JICHA)) {
+            $("#submitBtn").show();
+        }else{
+            $("#submitBtn").hide();
+        }
+        
+        if(hasRole(ROLE_STATION_ADMIN) && $.checkTask.check_status==5) {
+            $("#confirmBtn").show();
+            $("#appealBtn").show();
+        }else{
+            $("#appealBtn").hide();
+            $("#confirmBtn").hide();
+        }
+    }
     function queryScores(){
         // 使用data参数更新数据：
         var data = {
             "task_id": $.checkTask.id
         }
+        
         var cols = [
                     {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                     {width: 60, text: '评分记录', type: 'string', flex: true, sort: 'down',field: 'content'},
                     {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
-                    {width: 200, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
-                    {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                    {width: 200, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'}
+                ];
+        if(hasRole(ROLE_JICHA)) {
+            var oper = {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'}
                         ]
                     }
-                ];
-        
+            cols.push(oper);
+        }
         $('#score_datatable').mytable({'cols':cols,
                                 'url':"/score/getScoreList/",
                                 'param':data}
@@ -226,7 +270,7 @@
              layer.msg(data, {
                 time: 2000//20s后自动关闭
              });
-            changePage("/view/mytask/unchecked.html");
+            changePage("/view/mytask/task_list.html?status=2");
         });
         
     }
@@ -235,4 +279,16 @@
         appealLayer = showPopup4Common('申诉',saveAppeal,'600px','#appealDetail-div');
     }
 
+    function confirmCheck(){
+        var param = {
+            "id": $.checkTask.id,
+            "check_status":6
+        }
+        no_return_common_service("/task/update/",param,function(data){
+             layer.msg("确认成功", {
+                time: 2000//20s后自动关闭
+             });
+            changePage("/view/mytask/task_list.html?status=5");
+        });
+    }
     </script>

VisualInspection/dist/view/mytask/task_list.html

@@ -0,0 +1,32 @@
+<script src="/js/mytask/task_list.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="queryTable()">查询</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <br>
+
+    <div class="datatable"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        initTaskPage();
+    });
+</script>

VisualInspection/dist/view/mytask/unsubmit1111.html

@@ -0,0 +1,91 @@
+<!--<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;">
+    <div class="container-fluid ">
+    <form class="form-horizontal" style="margin-top:10px;">
+        <input type="hidden" class="form-control" id="apply_id" disabled="disabled" placeholder="">
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">申请人</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_man" disabled="disabled" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">申请时间</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_time" disabled="disabled" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">原因</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="apply_reason" disabled="disabled" placeholder="">
+            </div>
+        </div>
+    </form>
+</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"
+        });
+        if(hasRole(ROLE_STATION_ADMIN)){
+            var user = getCurrentUser();
+            setFeSelect("#fsList",user.organid);
+            $("#fsList").attr("disabled","disabled"); 
+        }else{
+            setFeSelect("#fsList");
+        }
+        queryConfirmedTask();
+    });
+</script>

VisualInspection/dist/view/term_management/charge_stuff_schedule.html

@@ -70,7 +70,7 @@
 
 
 <div class="modal fade" id="add_fee_station">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-lg" style="width:1000px;" >
         <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>
@@ -127,6 +127,9 @@
     div.day{
         text-align: center ;
     }
+    .content .events div:first-child{
+        background-color:chocolate !important ;
+    }
 </style>
 <script>
     $(document).ready(function() {

VisualInspection/dist/view/term_management/charge_terms_m.html

@@ -33,7 +33,7 @@
 <!--  end -->          
 <div style="display:none;" id="form-div">
     <div class="layer-content" style="width:100%;height:100%;">
-        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+        <div style="width:450px;overflow:hidden;zoom:1;margin:auto;">
             <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
                 <div style="width:80px;float:left;">
                     <span style="line-height:32px;">班组名称</span>
@@ -66,7 +66,7 @@
                 <div style="width:80px;float:left;">
                     <span style="line-height:32px;">人员</span>
                 </div>
-                <div id="member" style="width:270px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;max-height: 110px;overflow-y: auto;">
+                <div id="member" style="width:450px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;max-height: 210px;overflow-y: auto;">
                     
                 </div>
             </div>

VisualInspection/dist/view/term_management/check_stuff_schedule.html

@@ -23,36 +23,18 @@
             <!-- 添加对话框 -->
             <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>
                     <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 id="middle_term" type="text" class="form-control class_team_2" >
+                            <select id="all_term" type="text" class="form-control class_team_4" >
                                 <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>
+                        <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 class="form-control class_team_4" id="team_detail" style="height:auto;min-height:32px;"></div>
                         </div>
                     </div>
                     <hr>

VisualInspection/dist/view/user/addUser.html

@@ -74,7 +74,7 @@ function resetform() {
     $("#user_workno").val("");
     $("#user_password").val("");
     $("#user_confirm_password").val("")
-    $("#user_birth").val("")
+    // $("#user_birth").val("")
     $("#user_mobile").val("")
     $("#user_position").val("")
     $("#user_idno").val("")
@@ -92,11 +92,15 @@ function initUserInfo() {
     $("#user_workno").val(usertemp.workno);
     $("#user_password").val(usertemp.password);
     $("#user_confirm_password").val(usertemp.password)
-    $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
+    // $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
     $("#user_mobile").val(usertemp.mobile)
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
     $("#user_email").val(usertemp.email)
+    
+    $("#user_img_pre2").html("")
+    $("#user_img_add").removeClass("hide");
+    $("#user_img_pre").addClass("hide");
     if (typeof (usertemp.pic) != "undefinde" && usertemp.pic != null) {
         $("#user_img_pre").removeClass("hide");
         $("#user_img_add").addClass("hide");
@@ -116,7 +120,7 @@ function initUserInfo() {
         });
         $img0.attr("src", "/js/lib/imageupload/img/a7.png").appendTo($section);
         var $img = $("<img class='up-img up-opcity' id='user_pic'>");
-        $img.attr("src", base_server_url + usertemp.pic);
+        $img.attr("src", usertemp.pic);
         $img.appendTo($section);
         var $p = $("<p class='img-name-p'>");
         $p.html("image").appendTo($section);
@@ -158,7 +162,7 @@ function addUser() {
     var usermobile = $("#user_mobile").val();
     var useridno = $("#user_idno").val();
     var useremail = $("#user_email").val();
-    var userbirth = $("#user_birth").val();
+    // var userbirth = $("#user_birth").val();
     var userposition = $("#user_position").val();
     var usertruename = $("#user_true_name").val();
     var userroles = role_selectinput.getSelectedItemsId();
@@ -821,12 +825,12 @@ a,button{cursor:pointer;}
 
 
 
-        <div class="form-group">
+        <!--<div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">生日：</label>
             <div class="col-md-10 col-sm-10">
                 <input type="text" id="user_birth" class="form-control" placeholder="生日">
             </div>
-        </div>
+        </div>-->
 
 
         <div class="form-group">

VisualInspection/dist/view/user/userManager.html

@@ -1064,7 +1064,7 @@ function resetform() {
     $("#user_workno").val("");
     $("#user_password").val("");
     $("#user_confirm_password").val("")
-    $("#user_birth").val("")
+    // $("#user_birth").val("")
     $("#user_mobile").val("")
     $("#user_position").val("")
     $("#user_idno").val("")
@@ -1082,11 +1082,15 @@ function initUserInfo() {
     $("#user_workno").val(usertemp.workno);
     $("#user_password").val(usertemp.password);
     $("#user_confirm_password").val(usertemp.password)
-    $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
+    // $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
     $("#user_mobile").val(usertemp.mobile)
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
     $("#user_email").val(usertemp.email)
+    
+    $("#user_img_pre2").html("")
+    $("#user_img_add").removeClass("hide");
+    $("#user_img_pre").addClass("hide");
     if (typeof (usertemp.pic) != "undefinde" && usertemp.pic != null) {
         $("#user_img_pre").removeClass("hide");
         $("#user_img_add").addClass("hide");
@@ -1106,7 +1110,7 @@ function initUserInfo() {
         });
         $img0.attr("src", "/js/lib/imageupload/img/a7.png").appendTo($section);
         var $img = $("<img class='up-img up-opcity' id='user_pic'>");
-        $img.attr("src", base_server_url + usertemp.pic);
+        $img.attr("src", usertemp.pic);
         $img.appendTo($section);
         var $p = $("<p class='img-name-p'>");
         $p.html("image").appendTo($section);
@@ -1148,7 +1152,7 @@ function addUser() {
     var usermobile = $("#user_mobile").val();
     var useridno = $("#user_idno").val();
     var useremail = $("#user_email").val();
-    var userbirth = $("#user_birth").val();
+    // var userbirth = $("#user_birth").val();
     var userposition = $("#user_position").val();
     var usertruename = $("#user_true_name").val();
     var userroles = role_selectinput.getSelectedItemsId();
@@ -1811,12 +1815,12 @@ a,button{cursor:pointer;}
 
 
 
-        <div class="form-group">
+        <!--<div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">生日：</label>
             <div class="col-md-10 col-sm-10">
                 <input type="text" id="user_birth" class="form-control" placeholder="生日">
             </div>
-        </div>
+        </div>-->
 
 
         <div class="form-group">

VisualInspection/js/appeal_management/appeal_list.js

@@ -1,66 +1,82 @@
-
+var cur_status;
+function initAppealPage() {
+    initQueryParams();
+    initTableRowBtn();
+    queryAppeal();
+}
+function initQueryParams() {
+    // 仅选择日期
+    $("#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("#dept_select");
+    //获取页面参数
+    var page_params = $.zui.store.get("page_params");
+    if(page_params && page_params.status) {
+        cur_status = page_params.status;
+    }
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_11",[{func:'seeCheckAudit',text:'处理',icon_class:'icon-phone-sign'}]);
+    $.zui.store.set("task_table_btn_3",[{func:'showContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_4",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
+                                        {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}]);
+    $.zui.store.set("task_table_btn_5",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_6",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_21",[{func:'showApplyDetail',text:'处理',icon_class:'icon-hand-up'}]);
+}
 
 function initAppealList() {
-    //条件查询
-    $("#conditional_query").click(function(){
-        queryTable();
-    })
-
-    setFeSelect("#dept_select");
     queryTable();   
-    // getDeptList();
-    // //初始化部门下拉框
-    // function getDeptList(){
-    //     data ={}
-    //     post_common_service("dept/get/all", data, function(data){
-    //         $("#dept_select").empty();
-    //         $("#dept_select").append('<option value="">全部</option>');
-           
-    //         for(i=0;i<data.length;i++){
-    //             $("#dept_select").append('<option value="'+data[i].id+'">'+data[i].organname+'</option>');
-    //         }
-    //     }, function(){
-
-    //     });
-    // }
 }
 
-function queryTable(){
-        var data = {}
-        var name = $("#select_name").val();
-        if(name!=''){
-            data.name = name ;
-        }
-        var start_time = $("#start-time").val();
-        var end_time = $("#end-time").val();
-        var dept_select = $("#dept_select").val();
-        if(start_time != ''){
-            data.start_time = start_time;
-        }
-        if(end_time != ''){
-            data.end_time = end_time;
-        }
-        if(dept_select!='' && dept_select != 0){
-            data.appeal_dept = dept_select;
-        }
-        var hide = false;
-        if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
-            hide = true;
-        }
-        var cols = [
-                        {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        {width: 100, text: '任务名称', flex: false,colClass: '',field:'name'},
-                        {width: 80, text: '申诉人员',  flex: false, colClass: '',field:'appeal_man_name'},
-                        {width: 100, text: '申诉部门',  flex: false, colClass: '',sort: 'down',field:'appeal_dept_name'},
-                        {width: 80, text: '稽查人员', type: 'string', flex: false, hide:hide,colClass: '',field:'verify_person_name'},
-                        {width: 120, text: '稽查时间段', type: 'string', flex: false, colClass: '',field:'check_period'},
-                        {width: 80, text: '状态', type: 'string', flex: false, colClass: '',field:'check_status_name'},
-                        // {width: 120, text: '上次稽查时间', type: 'string', flex: false, colClass: '',field:'start_time'},
-                        {width: 100, text: '操作',  flex: false, colClass: '',field:'id',field_other:'task_id',oper:[
-                            {func:'seeCheckAudit',text:'处理',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
-                        ]},
-                    ] ;
-        
+function queryAppeal(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "checked_dept": $("#dept_select").val(),
+        "check_status": cur_status,
+    }
+    var hide = false;
+    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
+        hide = true;
+    }
+    
+    var cols = [
+            {width: 30, text: '序号', flex: true, colClass: 'text-center',field:'num'},
+            {width: 100, text: '任务名称', flex: true,colClass: '',field:'name'},
+            {width: 80, text: '申诉人员',  flex: true, colClass: '',field:'appeal_man_name'},
+            {width: 100, text: '申诉部门',  flex: true, colClass: '',sort: 'down',field:'appeal_dept_name'},
+            {width: 80, text: '稽查人员', type: 'string', flex: true, hide:hide,colClass: '',field:'checkman_name'},
+            {width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: '',field:'check_period'},
+            {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
+        ];
+    var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   
+    colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);
+    cols.push(colFunc);
         $('.datatable').mytable({'cols':cols,
                                 'url':"checkAppeal/getList",
                                 'param':data}
@@ -71,8 +87,12 @@ function seeCheckAudit(id,task_id){
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-    $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
+    post_common_service("/task/getById", {"id":task_id}, function(data){
+            $.checkTask = data;
+            $.checkTask.appeal = rowData;
+            console.log("申诉："+$.checkTask.appeal.id);
+            changePage("/view/mytask/taskDetail.html");
+        });
 // }
 }
 //再分配
@@ -90,7 +110,6 @@ function queryUnAssignedTable(){
             "start_time": $("#start_time").val(),
             "end_time": $("#end_time").val(),
             "checked_dept": $("#dept_select").val(),
-
         }
         var hide = false;
         if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
@@ -113,7 +132,7 @@ function queryUnAssignedTable(){
                         {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: 100, text: '操作',  flex: false, colClass: '',field:'id',field_other:'task_id',oper:[
-                            {func:'seeCheckAudit',text:'查看稽查结果',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
+                            {func:'seeCheckAudit1',text:'查看稽查结果',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
                         ]},
                     ] ;
         
@@ -123,7 +142,7 @@ function queryUnAssignedTable(){
                                 );
     }
 //查看稽查结果
-function seeCheckAudit(id,task_id){
+function seeCheckAudit1(id,task_id){
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));

VisualInspection/js/constant/constant.js

@@ -8,7 +8,7 @@ function queryConstant(){
                 {width: 80, text: '字典值', type: 'string', flex: false, field: 'code_value'},
                 {width: 80, text: '字典名称', type: 'string', flex: true, field: 'code_name'},
                 {width: 80, text: '有效标志', type: 'string', flex: false, field: 'valid'},
-                {width: 80, text: '代码标识', type: 'string', flex: true, field: 'code_flag'},
+                {width: 80, text: '字典标识', type: 'string', flex: true, field: 'code_flag'},
                 {width: 160, text: '标识名称', type: 'string', flex: false, field: 'flag_name'},
                 {width: 80, text: '备注', type: 'string', flex: true, field: 'remark'},
                 {width: 160, text: '操作', type: 'string', flex: true, field: 'id',

VisualInspection/js/lib/mytable.js

@@ -28,8 +28,8 @@
         this.obj = this;
         $(element).html('');
         if(flag) return;
-        $(element).append('<div class="row"><div id="my_table" data-checkable="true" data-sortable="true"></div></div>'
-                           + '<div id="kkpager" class="row" style="text-align:center"></div>');
+        $(element).append('<div class=""><div id="my_table" data-checkable="true" data-sortable="true"></div></div>'
+                           + '<div id="kkpager" class="" style="text-align:center"></div>');
         this.getRemoteData(element,this.options,this);
         return this;       
     };
@@ -136,7 +136,7 @@
                         var oper = cols[i].oper;
                         var operStr="";
                         for(var j=0;j<oper.length;j++){
-                            operStr+='&nbsp;<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>'+oper[j].text+' </a>&nbsp;';
+                            operStr+='&nbsp;<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>&nbsp;'+oper[j].text+' </a>&nbsp;';
                         }
                         dArr.push(operStr);
                     }else{

VisualInspection/js/main.js

@@ -146,6 +146,8 @@ function getPageInfo(id) {
 function changePage(url) {
     if (typeof (url) != "undefined") {
         CURRENT_PAGE_URL = url;
+        var page_params = GetQueryString(url);
+        $.zui.store.set("page_params", page_params);
         $("#main_content").load(base_ui_url + url);
 
         event = document.createEvent('MessageEvent');
@@ -153,4 +155,18 @@ function changePage(url) {
         event.initMessageEvent('changepage', true, true, CURRENT_PAGE_URL, origin, 1234, window, null);
         document.dispatchEvent(event);
     }
+}
+
+
+function GetQueryString(url)
+{
+     var theRequest = new Object();
+     if (url.indexOf("?") != -1) {
+        var str = url.split("?")[1];
+        strs = str.split("&");
+        for(var i = 0; i < strs.length; i ++) {
+            theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+        }
+     }
+     return theRequest;
 }

VisualInspection/js/mytask/checked.js

@@ -14,10 +14,10 @@ function queryCheckedTask(){
                 {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: 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:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}
                     ]
                 }
             ];

VisualInspection/js/mytask/task_list.js

@@ -0,0 +1,192 @@
+var cur_status;
+function initTaskPage() {
+    initQueryParams();
+    initTableRowBtn();
+    queryTask();
+}
+function initQueryParams() {
+    // 仅选择日期
+    $("#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;
+    }
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_2",[{func:'showCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_3",[{func:'showContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_4",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
+                                        {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}]);
+    $.zui.store.set("task_table_btn_5",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_6",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_21",[{func:'showApplyDetail',text:'处理',icon_class:'icon-hand-up'}]);
+}
+//查询任务
+function queryTask(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "checked_dept": $("#fsList").val(),
+        "check_status":cur_status
+    }
+    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: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'}
+            ];
+    var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   
+    colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);
+    cols.push(colFunc);
+    // 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'));
+    no_return_common_service('/task/update', {"id":id,"check_status":3})
+    changePage("/view/mytask/check.html");
+}
+//进入继续稽查页面
+function showContinueCheck(id){
+    // $('#myModal').modal({name:"dd"});
+    $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    changePage("/view/mytask/check.html");
+}
+//处置无效任务申请
+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',queryTask);
+}
+//拒绝申请
+function refuseApply(taskId){
+     var param = {
+        'id':$('#apply_id').val(),
+        'task_id':taskId
+    };
+    addOrUpdateItem4Common(param,'/checkApply/refuse',queryTask);
+}
+//任务详情页面
+function showTaskDetail(id){
+    var rowData=getItemByIdFromArr(id,$('.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){
+            queryTask();
+            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){
+            queryTask();
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
+        });
+    }, function(index){
+        layer.close(index);
+    });
+    
+}

VisualInspection/dist/js/mytask/unchecked.js → VisualInspection/js/mytask/unchecked1111111.js

@@ -3,7 +3,7 @@ function queryUncheckedTask(){
     var data = {
         "start_time": $("#start_time").val(),
         "end_time": $("#end_time").val(),
-        "dept": $("#dept").val(),
+        "checked_dept": $("#fsList").val(),
         "check_status":2
     }
     var cols = [
@@ -12,9 +12,9 @@ function queryUncheckedTask(){
                 {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: 'start_time'},
-                {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                {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'}
                     ]
@@ -40,7 +40,7 @@ function queryUnexaminedTask(){
     var data = {
         "start_time": $("#start_time").val(),
         "end_time": $("#end_time").val(),
-        "dept": $("#dept").val(),
+        "checked_dept": $("#fsList").val(),
         "check_status":21
     }
     var cols = [
@@ -49,9 +49,9 @@ function queryUnexaminedTask(){
                 {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: 'start_time'},
-                {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                {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'}
                     ]
@@ -118,20 +118,20 @@ function queryUndispatchedTask(){
     var data = {
         "start_time": $("#start_time").val(),
         "end_time": $("#end_time").val(),
-        "dept": $("#dept").val(),
+        "checked_dept": $("#fsList").val(),
         "check_status":4
     }
     var cols = [
-                {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
+                 {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: 'start_time'},
-                {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_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:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
                         {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}
                     ]
                 }
@@ -152,54 +152,70 @@ function showTaskDetail(id){
 }
 
 function dispatchTaskPatch(){
-    var param = {
-        "start_time": $("#start_time").val(),
-        "end_time": $("#end_time").val(),
-        "dept": $("#dept").val(),
-        "check_status":4
-    }
+     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后自动关闭
+        no_return_common_service('/task/dispatch', param, function(data){
+            queryUndispatchedTask();
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
         });
+    }, function(index){
+        layer.close(index);
     });
+   
 }
 
 function dispatchTaskById(id){
-    var param = {
-        "id": id,
-        "check_status":5
-    }
-
-    no_return_common_service('/task/dispatchById', param, function(data){
-        queryUndispatchedTask();
-        layer.msg(data, {
-            time: 2000//20s后自动关闭
+    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(),
-        "dept": $("#dept").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, colClass: '',field: 'checkman_name'},
-                {width: 100, text: '开始时间', type: 'string', flex: true, sort: 'down',field: 'start_time'},
-                {width: 100, text: '结束时间', type: 'string', flex: true, sort: 'down',field: 'end_time'},
-                {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_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'}
+                        {func:'showTaskDetail1',text:'详情',icon_class:'icon-tasks'}
                     ]
                 }
             ];
@@ -217,4 +233,86 @@ 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/dist/js/mytask/undispatched.js → VisualInspection/js/mytask/undispatched111.js

@@ -3,17 +3,16 @@ function queryUndispatchedTask(){
     var data = {
         "start_time": $("#start_time").val(),
         "end_time": $("#end_time").val(),
-        "dept": $("#dept").val()
+        "checked_dept": $("#fsList").val()
     }
     var cols = [
-                {width: 30, text: '序号', type: 'number', flex: true, colClass: 'text-center'},
-                {width: 80, text: '任务名称', type: 'date', flex: true, sort: 'down'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: ''},
-                {width: 80, text: '考核部门', type: 'date', flex: false, sort: 'down'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: ''},
-                {width: 80, text: '稽查时间段', type: 'date', flex: true, sort: 'down'},
-                {width: 80, text: '状态', type: 'string', flex: true, colClass: ''},
-                {width: 80, text: '稽查时间', type: 'string', flex: true, colClass: ''},
+                {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'}

VisualInspection/js/term_management/charge_terms_m.js

@@ -15,18 +15,18 @@
         }
         var cols = [
                         {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        {width: 100, text: '班组名称', flex: false,colClass: '',field:'name'},
-                        {width: 80, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(obj){
+                        {width: 50, text: '班组名称', flex: false,colClass: '',field:'name'},
+                        {width: 50, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(obj){
                             if(obj==1){
                                 return "收费人员";
                             }else if(obj == 2){
                                 return "稽查人员";
                             }
                         }},
-                        {width: 80, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
-                        {width: 80, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
-                        {width: 120, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
-                        {width: 50, text: '操作',  flex: false, colClass: '',field:'id',oper:[
+                        {width: 50, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
+                        {width: 50, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
+                        {width: 200, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
+                        {width: 80, text: '操作',  flex: false, colClass: '',field:'id',oper:[
                             {func:'updateCheckTeam',text:'修改',icon_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',icon_class:'icon-remove-circle'}
                         ]},
                     ] ;

VisualInspection/js/term_management/check_terms_m.js

@@ -15,7 +15,7 @@
         }
         var cols = [
                         {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        {width: 100, text: '班组名称', flex: false,colClass: '',field:'name'},
+                        {width: 70, text: '班组名称', flex: false,colClass: '',field:'name'},
                         {width: 80, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(obj){
                             if(obj==1){
                                 return "收费人员";
@@ -23,9 +23,9 @@
                                 return "稽查人员";
                             }
                         }},
-                        {width: 80, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
-                        {width: 80, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
-                        {width: 120, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
+                        {width: 40, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
+                        {width: 40, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
+                        {width: 200, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
                         {width: 50, text: '操作',  flex: false, colClass: '',field:'id',oper:[
                             {func:'updateCheckTeam',text:'修改',icon_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',icon_class:'icon-remove-circle'}
                         ]},

VisualInspection/view/appeal_management/appeal_list.html

@@ -18,7 +18,7 @@
                         </select>
                     </div>
                     <div class="col-sm-2">
-                        <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+                        <button class="btn btn-primary " type="button" id="conditional_query" onclick="queryAppeal()">查询</button>
                     </div>
                 </div>
             </form>
@@ -36,33 +36,7 @@
 
 <script type="text/javascript">
      $(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"
-        });
-        initAppealList();
+        initAppealPage();
     })
 </script>
 

VisualInspection/view/mytask/confirmed11.html

@@ -0,0 +1,68 @@
+<!--<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/dispatched.html → VisualInspection/view/mytask/dispatched11.html

@@ -1,68 +1,68 @@
-<!--<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>
+<!--<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

@@ -2,7 +2,7 @@
 <div class="container-fluid ">
       <div class="row">
         <h3>考核基本信息</h3>
-        <div class="page-header">
+        <div>
             <table style="width:100%;">
                 <tr>
                     <td width="20%">考核任务名：<label id="name"></label></td>
@@ -14,6 +14,7 @@
             </table>
         </div>
       </div>
+      <hr>
       <div class="row">
         <h3>考核任务流程</h3>
         <div id="flow_div">
@@ -25,12 +26,26 @@
         <div>
             <div id="score_datatable" data-checkable="true" data-sortable="true"></div>
         </div>
+    </div>
+    <hr>
+    <div class="row" id="appeal_div">
+        <h3>申诉基本信息</h3>
+        <div>
+            <table style="width:100%;">
+                <tr>
+                    <td width="20%">申诉时间：<label id="appeal_time"></label></td>
+                    <td width="20%">申诉原因：<label id="appeal_reason"></label></td>
+                </tr>
+                <tr>
+                    <td width="20%">附件：<label id="files"></label></td>
+                </tr>
+            </table>
+        </div>
       </div>
     <div class="row" style="margin-top:5px;text-align:center">
-        <div class="btn-group">
+        <div>
             <button id="submitBtn" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
-        </div>
-        <div class="btn-group">
+            <button id="confirmBtn" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
             <button id="appealBtn" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
         </div>
     </div>
@@ -75,6 +90,14 @@
         $("#checked_person").html($.checkTask.checked_person_name);
         $("#checked_dept").html($.checkTask.checked_dept_name);
 
+        if($.checkTask.appeal) {
+            $("#appeal_div").show();
+            $("#appeal_time").html($.checkTask.appeal_time);
+            $("#appeal_reason").html($.checkTask.appeal_reason);
+        }else{
+            $("#appeal_div").hide();
+        }
+
         genFlow();
         queryScores();
        
@@ -87,11 +110,13 @@
         }else{
             $("#submitBtn").hide();
         }
-
-        if(hasRole(ROLE_STATION_ADMIN)) {
+        
+        if(hasRole(ROLE_STATION_ADMIN) && $.checkTask.check_status==5) {
+            $("#confirmBtn").show();
             $("#appealBtn").show();
         }else{
             $("#appealBtn").hide();
+            $("#confirmBtn").hide();
         }
     }
     function queryScores(){
@@ -203,7 +228,7 @@
              layer.msg(data, {
                 time: 2000//20s后自动关闭
              });
-            changePage("/view/mytask/unchecked.html");
+            changePage("/view/mytask/task_list.html?status=2");
         });
         
     }
@@ -212,4 +237,16 @@
         appealLayer = showPopup4Common('申诉',saveAppeal,'600px','#appealDetail-div');
     }
 
+    function confirmCheck(){
+        var param = {
+            "id": $.checkTask.id,
+            "check_status":6
+        }
+        no_return_common_service("/task/update/",param,function(data){
+             layer.msg("确认成功", {
+                time: 2000//20s后自动关闭
+             });
+            changePage("/view/mytask/task_list.html?status=5");
+        });
+    }
     </script>

VisualInspection/view/mytask/task_list.html

@@ -0,0 +1,32 @@
+<script src="/js/mytask/task_list.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="queryTable()">查询</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <br>
+
+    <div class="datatable"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        initTaskPage();
+    });
+</script>

VisualInspection/view/mytask/unchecked.html → VisualInspection/view/mytask/unchecked111.html

@@ -1,59 +1,59 @@
-<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>
+<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/undispatched.html → VisualInspection/view/mytask/undispatched111.html

@@ -1,65 +1,65 @@
-<!--<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>
+<!--<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/unexamined.html → VisualInspection/view/mytask/unexamined111.html

@@ -1,62 +1,62 @@
-<!--<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="unexamined_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");
-        queryUnexaminedTask();
-    });
-</script>
+<!--<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="unexamined_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");
+        queryUnexaminedTask();
+    });
+</script>

VisualInspection/view/mytask/unsubmit1111.html

@@ -0,0 +1,68 @@
+<!--<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/term_management/charge_terms_m.html

@@ -33,7 +33,7 @@
 <!--  end -->          
 <div style="display:none;" id="form-div">
     <div class="layer-content" style="width:100%;height:100%;">
-        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+        <div style="width:450px;overflow:hidden;zoom:1;margin:auto;">
             <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
                 <div style="width:80px;float:left;">
                     <span style="line-height:32px;">班组名称</span>
@@ -66,7 +66,7 @@
                 <div style="width:80px;float:left;">
                     <span style="line-height:32px;">人员</span>
                 </div>
-                <div id="member" style="width:270px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;max-height: 110px;overflow-y: auto;">
+                <div id="member" style="width:450px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;max-height: 210px;overflow-y: auto;">
                     
                 </div>
             </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckAppeal.java

@@ -34,6 +34,10 @@ public class CheckAppeal {
     private Long appeal_dept;
     //考核任务
     private Long task_id;
+    //原因
+    private String appeal_reason;
+    //结果
+    private String recheck_result;
     //备注
     private String remark;
     
@@ -61,7 +65,11 @@ public class CheckAppeal {
     private String check_period;
     //第一次稽查人
     private Long checkman;
+    //第一次稽查人
+    private String checkman_name;
     //第二次稽查人
     private Long recheckman;
+    //第二次稽查人
+    private String recheckman_name;
     
 }

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.ibatis.exceptions.TooManyResultsException;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -26,6 +27,7 @@ import com.xintong.system.err.ErrorCode;
 import com.xintong.system.securityTools.JwtTokenUtil;
 import com.xintong.system.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.impl.CheckAppealServiceImpl;
 import com.xintong.visualinspection.util.CacheUtil;
 
 /**
@@ -35,6 +37,7 @@ import com.xintong.visualinspection.util.CacheUtil;
 @ControllerAdvice
 public class BaseController {
 	
+	private static final org.slf4j.Logger logger = LoggerFactory.getLogger(BaseController.class);
 	@Autowired
 	private JwtTokenUtil jwtTokenUtil;
 	@Autowired
@@ -159,7 +162,8 @@ public class BaseController {
         	code = new ErrorCode(20001,getValidatorErrors(bindingResult)); 
         } else{
         	code = new ErrorCode(11000);  
-        } 
+        }
+        logger.error(code.getDesc(), ex);
         return returnResult(code.getCode(),code.getDesc(),null);
     }
     

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

@@ -11,6 +11,8 @@
         <result column="verify_person" property="verify_person" jdbcType="INTEGER" />
         <result column="appeal_dept" property="appeal_dept" jdbcType="INTEGER" />
         <result column="task_id" property="task_id" jdbcType="INTEGER" />
+        <result column="appeal_reason" property="appeal_reason" jdbcType="VARCHAR" />
+        <result column="recheck_result" property="recheck_result" jdbcType="VARCHAR" />
         <result column="remark" property="remark" jdbcType="VARCHAR" />
         
         
@@ -36,6 +38,7 @@
         	<![CDATA[ AND ct.end_time < #{end_time}]]>
         </if>
         <if test="appeal_dept != null">AND ca.appeal_dept = #{appeal_dept}</if>
+        <if test="check_status != null">AND ct.check_status = #{check_status}</if>
         ORDER BY ca.appeal_time DESC
     </select>
 

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

@@ -36,21 +36,11 @@ public class CheckAppealServiceImpl extends BaseService implements CheckAppealSe
 	}
 	public List<CheckAppeal> getList(List<CheckAppeal> checkAppeallist){
 		for (CheckAppeal checkAppeal : checkAppeallist) {
-			if(checkAppeal.getAppeal_man()==null||CacheUtil.userMap.get(checkAppeal.getAppeal_man().longValue())==null){
-				checkAppeal.setAppeal_man_name("-");
-			}else{
-				checkAppeal.setAppeal_man_name(CacheUtil.userMap.get(checkAppeal.getAppeal_man().longValue()).getTruename());
-			}
-			if(checkAppeal.getVerify_person() == null || CacheUtil.userMap.get(checkAppeal.getVerify_person().longValue())==null){
-				checkAppeal.setVerify_person_name("-");
-			}else{
-				checkAppeal.setVerify_person_name(CacheUtil.userMap.get(checkAppeal.getVerify_person().longValue()).getTruename());
-			}
-			if(checkAppeal.getAppeal_dept()==null || CacheUtil.deptMap.get(checkAppeal.getAppeal_dept().longValue())==null){
-				checkAppeal.setAppeal_dept_name("-");
-			}else{
-				checkAppeal.setAppeal_dept_name(CacheUtil.deptMap.get(checkAppeal.getAppeal_dept().longValue()).getOrganname());
-			}
+			checkAppeal.setAppeal_man_name(CacheUtil.getUserTurenameFromMap(checkAppeal.getAppeal_man()));
+			checkAppeal.setVerify_person_name(CacheUtil.getUserTurenameFromMap(checkAppeal.getVerify_person()));
+			checkAppeal.setCheckman_name(CacheUtil.getUserTurenameFromMap(checkAppeal.getCheckman()));
+			checkAppeal.setRecheckman_name(CacheUtil.getUserTurenameFromMap(checkAppeal.getRecheckman()));
+			checkAppeal.setAppeal_dept_name(CacheUtil.getOrgannameFromMap(checkAppeal.getRecheckman()));
 		}
 		return checkAppeallist;
 	}

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/CacheUtil.java

@@ -14,4 +14,28 @@ public class CacheUtil {
 	public static Map<Long,Organ> deptMap = new HashMap<Long,Organ>();
 	
 	public static Map<String,Constant> codeMap = new HashMap<String,Constant>();
+	
+	public static User getUserFromMap(Long key){
+		if(key == null) return null;
+		return  CacheUtil.userMap.get(key);
+	}
+	
+	public static String getUserTurenameFromMap(Long key){
+		if(getUserFromMap(key)!=null){
+			return getUserFromMap(key).getTruename();
+		}
+		return null;
+	}
+	
+	public static Organ getOrganFromMap(Long key){
+		if(key == null) return null;
+		return  CacheUtil.deptMap.get(key);
+	}
+	
+	public static String getOrgannameFromMap(Long key){
+		if(getOrganFromMap(key)!=null){
+			return getOrganFromMap(key).getOrganname();
+		}
+		return null;
+	}
 }

VisualInspection_server/src/main/resources/application.properties

@@ -2,16 +2,17 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://192.168.8.236:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://192.168.8.236:3306/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -52,11 +53,11 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=10.112.0.199
-#spring.redis.host=git.topm.win
+#spring.redis.host=10.112.0.199
+spring.redis.host=192.168.8.236
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-#spring.redis.port=6380
-spring.redis.port=6379  
+spring.redis.port=6379
+#spring.redis.port=6379  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09
@@ -72,11 +73,11 @@ spring.redis.timeout=0
 
 
 
-logging.level.root=DEBUG
+logging.level.root=INFO
 logging.level.org.springframework.web=DEBUG
 logging.level.org.springframework.data=DEBUG
 logging.level.org.springframework.security=DEBUG
-logging.level.org.mybites=DEBUG
+logging.level.org.mybites=INFO