From 7fb7667ef0b9482c8330d5ec0af89181a79f5b21 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 29 Mar 2024 10:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=84=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/evaluation/EvaDown.vue          | 10 ++++-
 src/views/evaluation/evaluationUpload.vue | 53 +++++++++++++----------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/src/views/evaluation/EvaDown.vue b/src/views/evaluation/EvaDown.vue
index 7cf3a1b9..d446c0b2 100644
--- a/src/views/evaluation/EvaDown.vue
+++ b/src/views/evaluation/EvaDown.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { ref,onMounted, reactive,toRefs,computed } from "vue";
+import { ref,onMounted, reactive,toRefs,computed,watch } from "vue";
 import dialog from "@/utils/dialog";
 import { getPage,deleteById } from "@/api/evaluation";
 import { useRoute } from "vue-router";
@@ -149,7 +149,15 @@ import {boeRequest} from "@/api/request";
         state.params.pageSize = pageSize
         listData()
       }
+      watch(()=>state.params.pageSize,(val)=>{
+        state.params.pageNo = 1
+        listData()
+      })
       const downloadAll = (record) => {
+        if(state.total == 0){
+          message.info('请先上传报告')
+          return
+        }
         window.open(`/activityApi/evaluation/download?id=${route.query.id}`);
       }
       const listData = async () => {
diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue
index 2bf57bfd..565cd80b 100644
--- a/src/views/evaluation/evaluationUpload.vue
+++ b/src/views/evaluation/evaluationUpload.vue
@@ -1099,6 +1099,10 @@ import { message } from "ant-design-vue";
         state.btShow = trueFalse(record.permission,4)
       }
       const downloadAll = async (record) => {
+        if(record.reportReleaseNums == 0){
+          message.info('请先上传报告')
+          return
+        }
         window.open(`/activityApi/evaluation/download?id=${record.id}`);
       }
       const of_exit = () => {
@@ -1138,22 +1142,6 @@ import { message } from "ant-design-vue";
         }
         state.tableLoading = true
         
-        if(state.uploadStatus||state.btShow){
-          console.log(state.uploadStatus,'state.uploadStatus')
-          await save({
-            id: state.uploadDownId,
-            creatId:userInfo.value.userId,
-            creatName:userInfo.value.realName,
-            prefix:'',
-            remarks:state.formData.remarks,
-            evaluationName:state.formData.evaluationName,
-            // detailIds:state.idValue,
-            downloadUrls:state.downloadUrl,
-            imagePath:state.formData.cover
-          }).then((res)=>{
-            console.log(res.data,'data')
-          })
-        }
         if(state.valueAll.length != 0 && !state.loadData){
           if(state.valueAll.length >1){
             state.bg_results = true
@@ -1164,14 +1152,31 @@ import { message } from "ant-design-vue";
             }
           })
           // 
-          await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
-            if(res.code == 200){
-              message.success(res.msg)
-            }
-            if(res.data.code == -1){
-              message.error('保存失败')
-            }
-            console.log(res,'aaa')
+          // await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
+          //   if(res.code == 200){
+          //     message.success(res.msg)
+          //   }
+          //   if(res.data.code == -1){
+          //     message.error('保存失败')
+          //   }
+          //   console.log(res,'aaa')
+          // })
+        }
+        if(state.uploadStatus||state.btShow){
+          console.log(state.uploadStatus,'state.uploadStatus')
+          await save({
+            id: state.uploadDownId,
+            creatId:userInfo.value.userId,
+            creatName:userInfo.value.realName,
+            prefix:'',
+            remarks:state.formData.remarks,
+            evaluationName:state.formData.evaluationName,
+            // detailIds:state.idValue,
+            evaluationDetailList:state.valueAll,
+            downloadUrls:state.downloadUrl,
+            imagePath:state.formData.cover
+          }).then((res)=>{
+            console.log(res.data,'data')
           })
         }
         //else{