odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 重新提交全流程初步完成

Browse Source
This commit is contained in:
odjbin
2024-05-20 23:01:53 +08:00
parent 6c80652416
commit 3270aeef06
12 changed files with 280 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/views/project-management/filing/conclusion.vue
View File

@@ -23,7 +23,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
import {downloadFile} from "@/api/project-demand";
import {ElNotification} from "element-plus";
import {useProcessStore} from '@/stores/processStore.js';
import {getProjectConclusionProcess, projectConclusion} from "@/api/project-manage";
import {getProjectConclusionProcess, projectConclusion,getConclusionDetail, resubmitConclusion} from "@/api/project-manage";
const router = useRouter()
const route = useRoute()
const tagsViewStore = useTagsView()
@@ -128,11 +128,11 @@ const handleSubmit = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
// if(JSON.stringify(file.value) == "{}"){
// applyForm.value.validate()
// } else {
// applyForm.value.clearValidate()
// }
if(JSON.stringify(file.value) === "{}"){
attachment.value.validate()
} else {
attachment.value.clearValidate()
}
if (!valid) return
let files = []
let singleFile={}
@@ -147,7 +147,7 @@ const handleSubmit = (instance) => {
let params = {
deploymentId: deploymentId.value,
requirementId: route.query.id,
files: files,
fileList: files,
singleFile: singleFile,
projectId:route.query.projectId,
}
@@ -170,7 +170,12 @@ const handleResubmit = () => {
let singleFile = {}
let otherFiles = []
let fileArray
if(name.value === 'Filing/edit'){
if (JSON.stringify(file.value) === "{}"||attachment.value.singleFile===null) {
attachment.value.validate()
} else {
attachment.value.clearValidate()
}
if(attachment.value.singleFile!==null&&name.value === 'Filing/edit'){
singleFile = {
fileId: attachment.value.singleFile.fileId
}
@@ -190,37 +195,37 @@ const handleResubmit = () => {
let params={
deploymentId: deploymentId.value,
requirementId: route.query.id,
files: otherFiles,
fileList: otherFiles,
singleFile: singleFile,
projectId:route.query.projectId,
}
console.log('重新提交params',params)
// resubmitReported(params).then(res => {
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000) {
// tagsViewStore.delVisitedViews(router.currentRoute.value.path)
// router.push({
// name: 'Filing'
// })
// }
// })
resubmitConclusion(params).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
router.push({
name: 'Filing'
})
}
})
}
const getDetailInfo = async () => {
// getDetail(route.query.projectId).then(res => {
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000) {
// formData.value = res.data.formData
// loading.value=false
// }
// })
getConclusionDetail(route.query.projectId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
formData.value = res.data.formData
loading.value=false
}
})
}
const init = () => {
getProjectConclusionProcess().then(res => {
@@ -242,12 +247,11 @@ const init = () => {
})
}
onMounted(async () => {
loading.value=true
await init()
if (route.query.projectId) {
if (name.value === 'Filing/edit') {
loading.value=true
await getDetailInfo()
}
})
</script>