Merge branch 'zcwy-0306' into dev0223

src/views/evaluation/EvaDown.vue

@@ -205,7 +205,7 @@ import {boeRequest} from "@/api/request";
         dialog({
           content: '请您确认是否要删除该报告？',
           ok: () => {
-            deleteById({id:record.id,kid:record.kid}).then((res)=>{
+            deleteById({id:record.id,kid:record.kid,pid:route.query.id}).then((res)=>{
               message.success('删除成功')
               listData()
             })

src/views/evaluation/evaluationUpload.vue

@@ -697,7 +697,7 @@ import {timeoutUpload} from "@/api/configPublic";
         totalNumber: {},
         stateType:'',
         uploadDownLoad: false,
-        uploadDownId: '',
+        uploadDownId: null,
         loadData: false,
         saveList: [],
         powerStatus:{},
@@ -1083,7 +1083,7 @@ import {timeoutUpload} from "@/api/configPublic";
       //报告上传
       const bgupload = () => {
         state.loadNewDown = false
-        state.uploadDownId = ''
+        state.uploadDownId = null
         state.downloadUrl = null
         state.uploadId = ''
         state.valueAll = []
@@ -1159,7 +1159,7 @@ import {timeoutUpload} from "@/api/configPublic";
               item.createId = userInfo.value.userId
             }
           })
-          // 
+          // 保存上传文件
           await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
             if(res.code == 200){
               if(res.data.length!=0){