Merge branch 'zcwy-0306' into dev0223

This commit is contained in:
zhangsir
2024-04-12 09:01:04 +08:00

View File

@@ -1186,9 +1186,12 @@ import {timeoutUpload} from "@/api/configPublic";
state.uploadDownLoad = true state.uploadDownLoad = true
if( !state.loadData&&state.loadNewDown){ if( !state.loadData&&state.loadNewDown){
// 保存上传文件 // 保存上传文件
if(state.sussessIds == null){
state.sussessIds = []
}
await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{ await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{
id:state.uploadId, id:state.uploadId,
successIds:state.sussessIds?state.sussessIds.split(','):null successIds:state.sussessIds.length!=0?state.sussessIds.split(','):null
}).then((res)=>{ }).then((res)=>{
state.uploadDownLoad = false state.uploadDownLoad = false
state.saveNotUpload = false state.saveNotUpload = false
@@ -1203,6 +1206,9 @@ import {timeoutUpload} from "@/api/configPublic";
}) })
} }
if(state.uploadStatus||state.btShow){ if(state.uploadStatus||state.btShow){
if(state.sussessIds == null){
state.sussessIds = []
}
await boeRequest('/activityApi/evaluation/save post',{ await boeRequest('/activityApi/evaluation/save post',{
id: state.uploadDownId, id: state.uploadDownId,
createId:userInfo.value.userId, createId:userInfo.value.userId,
@@ -1212,7 +1218,7 @@ import {timeoutUpload} from "@/api/configPublic";
evaluationName:state.formData.evaluationName, evaluationName:state.formData.evaluationName,
workNum: userInfo.value.userNo, workNum: userInfo.value.userNo,
imagePath:state.formData.cover, imagePath:state.formData.cover,
successIds:state.saveNotUpload?state.sussessIds?state.sussessIds.split(','):null:null successIds:state.saveNotUpload?state.sussessIds.length!=0?state.sussessIds.split(','):null:null
}).then((res)=>{ }).then((res)=>{
if(res.code == 200){ if(res.code == 200){
state.uploadDownLoad = false state.uploadDownLoad = false
@@ -1337,7 +1343,6 @@ import {timeoutUpload} from "@/api/configPublic";
state.bg_results = true state.bg_results = true
state.uploadDownLoad = false state.uploadDownLoad = false
}else{ }else{
console.log(file.response,'错误消息')
state.uploadDownLoad = false state.uploadDownLoad = false
} }
if(state.stateUpload){ if(state.stateUpload){