2
0

2 Commits 8502b74c7c ... a534e16f09

Autor SHA1 Nachricht Datum
  cldu a534e16f09 Merge branch 'gn2.2' into debug vor 1 Woche
  cldu 22cb9beba5 bug_fixed vor 1 Woche

+ 3 - 1
src/views/approve_manage/approveDetail.vue

@@ -223,7 +223,9 @@ export default {
                         //只有依次审批需要看顺序
                         if(i.ApproveType===1){
                             this.approveInfo.isCurrentApprover = i.Users[hasUser].ApproveRecord?true:false
-                        }else{
+                        } else if(i.ApproveType===2){ //会签
+                            this.approveInfo.isCurrentApprover = i.Users[hasUser].ApproveRecord && i.Users[hasUser].ApproveRecord.State == 1 ? true : false;
+                        } else{
                             this.approveInfo.isCurrentApprover = true
                         }
                     }else{

+ 3 - 0
src/views/report_manage/reportV2/normalReport/components/KnowResource.vue

@@ -446,6 +446,9 @@ div {
           margin-top: 10px;
           color: #666666;
           line-height: 20px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
       }
     }

+ 3 - 0
src/views/report_manage/reportV2/smartReport/components/KnowResource.vue

@@ -466,6 +466,9 @@ div {
           margin-top: 10px;
           color: #666666;
           line-height: 20px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
       }
     }