MSI\liwei 7 лет назад
Родитель
Сommit
4a9607898f

+ 1 - 1
VisualInspection/js/mytask/check.js

@@ -1066,7 +1066,7 @@ function initUpLoad() {
         swf: 'lib/webuploader/js/Uploader.swf',
 
         // 文件接收服务端。
-        server: base_image_server_url + '/filesSrver/' + FILE_UPLOAD,
+        server: base_image_server_url + 'f/filesSrver/' + FILE_UPLOAD,
 
         // 选择文件的按钮。可选。
         // 内部根据当前运行是创建,可能是input元素,也可能是flash.

+ 2 - 2
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";

+ 1 - 1
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);
     });
 }
 

+ 1 - 1
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");

+ 3 - 2
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();
                 }