浏览代码

安全检查

jiawuxian 2 年之前
父节点
当前提交
4b73d734e2

+ 3 - 2
src/views/check/task/index.vue

@@ -397,9 +397,10 @@ export default {
     showscanRecord(row) {
       this.$refs.scanrecorddialog.show(row.id, row.orgId);
     },
-    showRegisterBtn(row){      
+    showRegisterBtn(row){   
+      return true;   
       //缺少检查角色列表,grantUserId
-        return (row.checkOrgId==this.orgId && this.roleList.map(r=>r.id).find(id=>id==row.roleId)) || row.grantUserId===this.userId;
+        // return (row.checkOrgId==this.orgId && this.roleList.map(r=>r.id).find(id=>id==row.roleId)) || row.grantUserId===this.userId;
     },
     showRegister(row) {
       let path = "/core/safetycheck/register/" + row.id+"?mode=register";

+ 2 - 2
src/views/question/list/dialog.vue

@@ -386,7 +386,7 @@ export default {
 .question-dialog-body{
   max-height: 500px;
   overflow-y: auto;
-  padding-right: 15px;
+  padding-right: 20px;
 }
 
 .question-dialog-body>div{
@@ -401,7 +401,7 @@ export default {
 }
 
 .question-dialog-body>div:not(:first-child){
-  padding-top: 15px;
+  padding-top: 20px;
 }
 .question-dialog-body>div:last-child{
   border: none;

+ 3 - 1
src/views/safetycheck/taskManager/components/register.vue

@@ -224,7 +224,7 @@ export default {
         return;
       }
 
-      let userRoleIds = this.roleList.map((r) => r.id);
+      let userRoleIds = this.roleList.map((r) => r.roleId+'');
       let taskRoleIds = r.data.checkRoles.map((r) => r.id);
 
       if (
@@ -234,7 +234,9 @@ export default {
       ) {
         this.info = r.data;
       } else {
+        debugger
         this.$message.warning("用户不能执行该任务");
+        this.mode='info'
       }
     });
   },