Merge branch '250213-prod-master_1202-gx' into master_1202

src/utils/zipdownload.js

@@ -46,7 +46,11 @@ export function downLoadZipManage(str, filename,fun) {
       return;
     }
     resolveBlob(res, mimeMap.xlsx,filename)
-    if(fun) fun()
+    if(fun) {
+      console.log("有数据 执行 fun",fun)
+      fun(res.headers.ecode) 
+    }
+    fun(res.headers.ecode) 
   })
 }
 /**

src/views/report/TrainingNewManager.vue

@@ -20,9 +20,13 @@ import { message } from "ant-design-vue";
     spinning.value = true
     if(uploadAdmin('training-admin')){
       downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据',function(code){
+        console.log("downLoadZipManage 导出成功 code",code)
         if(code == 4){
           spinning.value = false;
           message.error("权限不足!");
+        } else {
+          console.log("downLoadZipManage 导出成功 code",code)
+          spinning.value = false;
         }
     
       })
@@ -30,7 +34,8 @@ import { message } from "ant-design-vue";
     }
     if(adminType?.value.length>0){
       let orgs = adminType.value.join(',')
-      downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据',function(){
+      downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据',function(code){
+        console.log("downLoadZipManage 导出成功 code",code)
         spinning.value = false
       })
     }