Merge branch 'zcwy-zsx0223' into 'master'

测评管理

See merge request !174

src/views/evaluation/evaluationUpload.vue

@@ -1443,7 +1443,9 @@ import {downLoadZip} from "@/utils/zipdownload";
             successIds:state.saveNotUpload?state.sussessIds.length!=0?state.sussessIds.split(','):null:null
           }).then((res)=>{
             if(res.status == 500){
-              message.error('测评标题和报告名称不一致')
+              if(res.message){
+                message.error(res.message)
+              }
               state.uploadDownLoad = false
               state.uploadStatusType = false
             }
@@ -1451,6 +1453,9 @@ import {downLoadZip} from "@/utils/zipdownload";
               state.uploadDownLoad = false
               state.bg_check = false
             }
+          }).catch(err=>{
+              state.uploadDownLoad = false
+              state.uploadStatusType = false
           })
         }
         if(state.uploadStatusType){