Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection

* 'master' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection:
  bug
  bug
  bug

VisualInspection/js/util/const.js

@@ -66,5 +66,5 @@ var ROLE_ADMIN = "ROLE_ADMIN";
 var ROLE_ROAD_MANAGER = "ROLE_ROAD_MANAGER";
 var ROLE_FWQ_ADMIN = "ROLE_FWQ_ADMIN";
 var ROLE_FWQ = "ROLE_FWQ";
-var ROLE_QZD_ADMIN = "ROLE_QZD_ADMIN";
-var ROLE_QZD = "ROLE_QZD";
+var ROLE_QZD_ADMIN = "ROLE_WRECKER_MANAGER";
+var ROLE_QZD = "ROLE_WRECKER";

VisualInspection/qzd/js/appeal_management/appeal_list.js

@@ -205,7 +205,7 @@ function showAppealContinueCheck(id) {
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        changePage("/qzd/view/mytask/check.html", appealTableObj);
+        changePage("qzd/view/task/check.html", appealTableObj);
     });
 }
 

VisualInspection/qzd/js/task/check.js

@@ -754,7 +754,7 @@ function zTreeOnClick(event, treeId, treeNode) {
         'content': treeNode.value,
         'check_item_id': treeNode.id,
         'checkman': $.checkTask.checkman,
-        'checked_area': $.checkTask.area_id,
+        'checked_area': $.checkTask.checked_users.split(",")[0],
         'checked_dept': $.checkTask.checked_dept
     };
     no_return_common_service("/q/score/add", param, function(data) {

VisualInspection/qzd/js/task/new.js

@@ -89,7 +89,7 @@ function queryTask() {
         { width: 160, text: '出勤人员', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'userNames' },
         // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
     ];
-    user.roles[0].id = 1;
+    //user.roles[0].id = 1;
     if (user.roles[0].id == 1) {
         var colFunc = { width: 160, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");

VisualInspection/qzd/js/task/task_list.js

@@ -204,7 +204,6 @@ function dispatchTaskPatch() {
 
 //下发单条任务
 function dispatchTaskById(id) {
-    alert(id);
     layer.confirm('确定下发任务？', {
         btn: ['确定', '取消'] //按钮
     }, function() {

VisualInspection/qzd/view/task/taskDetail.html

@@ -109,8 +109,6 @@
     $(document).ready(function() {
         addBreadMenu("/qzd/view/task/taskDetail.html", "稽查详情");
         checkAuth();
-        console.log(11111111);
-        console.log($.checkTask);
         $("#name").html($.checkTask.name);
         $("#checkman").html($.checkTask.checkman_name);
         $("#checktime").html($.checkTask.start_time);
@@ -134,6 +132,7 @@
 
     //初始化表行按钮
     function initBtns() {
+        console.log(getCurrentUser());
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA + "_2", ["#submitBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA + "_3", ["#submitBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA + "_7", ["#submitBtn"]);
@@ -156,9 +155,11 @@
     }
 
     function showBtn(role, status) {
+     //   console.log(getCurrentUser());
         if (hasRole(role)) {
             var btnArr = $.zui.store.get("task_detail_btn_" + role + "_" + status);
             if (btnArr) {
+                console.log(btnArr);
                 for (var i in btnArr) {
                     $(btnArr[i]).show();
                 }