修改bug

VisualInspection/js/config.js

@@ -15,8 +15,8 @@ function getserveraddr(){
         return "http://server_yanhai.jsxt.jsjtyxt.com/";
     }
     else if(base_ui_url.indexOf("localhost")!=-1){
-        // return "http://server_yanhai.jsxt.jsjtyxt.com/"
-        return "http://localhost:8089/"
+        // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
+         return "http://localhost:8089/"
     }
     else if(base_ui_url.indexOf("192.168.8.236")!=-1){
         return "http://192.168.8.236:8089/"

VisualInspection/js/lib/mytable.js

@@ -185,6 +185,8 @@
                             checkedIds.push(element.tt_data[i].id);
                         }
                         element.tt_checkedIds = checkedIds;
+                        $(element).data("select_cache",checkedIds);
+                        console.log(element.tt_checkedIds);
                     }
                 });
             }
@@ -217,7 +219,8 @@
                 case 'getTableData': 
                     return this[0].tt_data;
                 case 'getTableCheckedIds': 
-                    return this[0].tt_checkedIds;
+                    // return this[0].tt_checkedIds;
+                    return $(this).data("select_cache");
                 case 'empty': 
                     return new mytable(this,options,true);
             }

VisualInspection/js/mytask/check.js

@@ -186,7 +186,11 @@ function getUserCheckCount() {
         "checked_person": $.checkTask.checked_person
     };
     post_common_service("/task/getUserCount/", param, function (userList) { 
-        $("#checked_count").html(userList.length);
+        if(userList){
+            $("#checked_count").html(userList.length);
+        }else{
+           $("#checked_count").html(0); 
+        }
     });
 }
 
@@ -500,7 +504,8 @@ function changePerson(id) {
     post_common_service("/task/getUserCount/", param, function(data){
         if(data && data.length>=2){
             layer.msg("本周期稽查次数已满，不能再被稽查！", {
-                time: 2000//20s后自动关闭
+                time: 2000,//20s后自动关闭
+                offset:'r'
             });
         }else{
             // $('#checked_person').html(id);

VisualInspection/js/mytask/task_list.js

@@ -170,17 +170,36 @@ function showTaskDetail(id){
 }
 //下发所有任务
 function dispatchTaskPatch(){
-    layer.confirm('确定下发全部任务？', {
+     var param = {
+        // "start_time": $("#start_time").val(),
+        // "end_time": $("#end_time").val(),
+        // "checked_dept": $("#dept").val(),
+        "check_status":4,
+        "dispatch_ids":$('.datatable').mytable('getTableCheckedIds')
+    }
+    console.log("放假啦:"+param.dispatch_ids);
+    if(!param.dispatch_ids || param.dispatch_ids.length==0){
+        layer.msg('请选择下发任务！', {
+            time: 2000//20s后自动关闭
+        });
+        return;
+    }
+    layer.confirm('确定下发选中任务？', {
         btn: ['确定','取消'] //按钮
     }, function(){
-        var param = {
-            // "start_time": $("#start_time").val(),
-            // "end_time": $("#end_time").val(),
-            // "checked_dept": $("#dept").val(),
-            "check_status":4,
-            "dispatch_ids":$('.datatable').mytable('getTableCheckedIds')
-        }
-
+        // var param = {
+        //     // "start_time": $("#start_time").val(),
+        //     // "end_time": $("#end_time").val(),
+        //     // "checked_dept": $("#dept").val(),
+        //     "check_status":4,
+        //     "dispatch_ids":$('.datatable').mytable('getTableCheckedIds')
+        // }
+        // if(param.dispatch_ids || param.dispatch_ids.length==0){
+        //     layer.msg('请选择下发任务！', {
+        //         time: 2000//20s后自动关闭
+        //     });
+        //     return;
+        // }
         no_return_common_service('/task/dispatch', param, function(data){
             queryTask();
             layer.msg(data, {

VisualInspection/js/user/userManager.js

@@ -35,13 +35,13 @@
      sort: 'down',
      colClass: 'text-center'
  }, {
-     width: 200,
+     width: 150,
      text: '角色',
      type: 'string',
      flex: true,
      colClass: 'text-center'
  }, {
-     width: 140,
+     width: 200,
      text: '操作',
      type: 'string',
      flex: true,
@@ -155,11 +155,40 @@
                  })
          }
 
+         if(this.name=="user_tansfer") {
+             var user = UserMap.get(parseInt(this.id));
+             var id = this.id;
+             scoreLayer = showPopup4Common('选择目标收费站', function(){
+                transferFs(id);
+             }, ['400px', '200px'], '#transfer_div');            
+             setFeSelect("#tansferFsList", user.organid);
+         }
      });
-
-
  });
 
+function transferFs(id){
+    var dept = $("#tansferFsList").val();
+    if(dept){
+        var parm={
+            "id":id,
+            "organid":dept
+        };
+        UserUpdate(parm, function (data) {
+            layer.msg('转站成功！', {
+                time: 2000, //20s后自动关闭
+            }, function () {
+                $('#addUserModal').modal('hide')
+                updateUser(dept_selectinput.value)
+            });
+        }, function (error) {
+
+        });
+    }else{
+        layer.msg('请选择转移部门！', {
+            time: 2000, //20s后自动关闭
+        });
+    }
+}
  function getDept() {
      function zTreeOnRename(event, treeId, treeNode, isCancel) {
          alert(treeNode.tId + ", " + treeNode.name);
@@ -288,7 +317,11 @@
                      UserMap.set(user.id, user)
                      var userdata = {};
                      userdata["checked"] = false;
-                     userdata["data"] = [i + 1, user.username, user.truename, user.workno == null ? -1 : user.workno, user.mobile == null ? "" : user.mobile, attr, '<button class="btn btn-primary" name="user_edit" id=' + user.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + user.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
+                     var btns = '<button class="btn btn-primary btn-sm" name="user_edit" id=' + user.id + '><i class="icon icon-edit"></i>修改</button> <button class="btn btn-danger btn-sm" name="user_tansfer" id=' + user.id + '><i class="icon icon-random"></i>转站</button>';
+                     if(!roleContains("STATION")) {
+                        btns+='<button class="btn btn-primary btn-sm" name="user_delete" id=' + user.id + ' ><i class="icon icon-remove-circle"></i>删除</button>';
+                     }
+                     userdata["data"] = [i + 1, user.username, user.truename, user.workno == null ? -1 : user.workno, user.mobile == null ? "" : user.mobile, attr, btns];
                      rowdata.push(userdata);
                  }
              }

VisualInspection/view/user/userManager.html

@@ -76,4 +76,15 @@
             </div>
         </div>
     </div>
+</div>
+<div id="transfer_div" style="display:none;text-align:center;padding:5px;">
+    <form class="form-horizontal" style="margin-top:10px;">
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">选择转移目标收费站</label>
+            <div class="col-md-6 col-sm-10">
+                <select class="form-control" id="tansferFsList">                   
+                </select>
+            </div>
+        </div>     
+    </form>
 </div>