diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index e8c8533..4a36418 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -193,12 +193,12 @@ const deleteAttachment = (val) => { type: 'success' }) isSingleFile.value = false - singleFile.value={} + singleFile.value=null } }); } const deleteSingleFile = (row, type) => { - ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', { + ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的文件吗?`, '系统提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -212,7 +212,7 @@ const deleteSingleFile = (row, type) => { if (res.code === 1000) { isSingleFile.value=false if (type === 1) { - singleFile.value = {} + singleFile.value = null } else { props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1); } diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index d5c7bdc..8d1bb39 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -22,7 +22,7 @@
- +
@@ -67,6 +67,10 @@ const props = defineProps({ value: { type: String, default: '' + }, + idName: { + type: String, + default: '' } }) const form = ref() @@ -224,7 +228,7 @@ const handleDownload = (row) => { }) } watchEffect(() => { - Object.keys(props.formData).length && (form.value.setValues(props.formData)) + Object.keys(props.formData).length && (form.value?.setValues(props.formData)) }) watch(() => props.loading, (newVal) => { diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue new file mode 100644 index 0000000..8ae2735 --- /dev/null +++ b/src/components/DetailComponent/ProjectApply.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 1c2eeeb..f814d0b 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -16,8 +16,8 @@ - - + + {{ formData.specialFund }} @@ -433,14 +433,7 @@ const handleResubmit = debounce(() => { otherFiles.push(getFileParam(item)) }) } - let params = { - ...formData.value, - deploymentId: deploymentId.value, - fileList: otherFiles, - requirementId: route.query.id ? route.query.id : '-1' - } - console.log('重新提交params', params) - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -448,9 +441,16 @@ const handleResubmit = debounce(() => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + ...formData.value, + deploymentId: deploymentId.value, + fileList: otherFiles, + requirementId: route.query.id ? route.query.id : '-1' + } + console.log('重新提交params', params) resubmitReported(params).then(res => { ElNotification({ title: '提示', diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue index ddf32f4..d779200 100644 --- a/src/views/project-management/filing/conclusion.vue +++ b/src/views/project-management/filing/conclusion.vue @@ -174,14 +174,7 @@ const handleResubmit = () => { otherFiles.push(getFileParam(item)) }) } - let params = { - deploymentId: deploymentId.value, - requirementId: route.query.id, - fileList: otherFiles, - singleFile: formData.value.singleFile, - projectId: route.query.projectId, - } - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -189,9 +182,16 @@ const handleResubmit = () => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + deploymentId: deploymentId.value, + requirementId: route.query.id, + fileList: otherFiles, + singleFile: attachment.value.singleFile, + projectId: route.query.projectId, + } console.log('重新提交params', params) resubmitConclusion(params).then(res => { ElNotification({ diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue index b5f18fd..e219b9e 100644 --- a/src/views/project-management/implementation/check.vue +++ b/src/views/project-management/implementation/check.vue @@ -135,15 +135,7 @@ const handleResubmit = (instance) => { otherFiles.push(getFileParam(item)) }) } - - let params = { - deploymentId: deploymentId.value, - requirementId: route.query.id, - fileList: otherFiles, - singleFile: formData.value.singleFile, - projectId: route.query.projectId, - } - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -151,9 +143,16 @@ const handleResubmit = (instance) => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + deploymentId: deploymentId.value, + requirementId: route.query.id, + fileList: otherFiles, + singleFile: attachment.value.singleFile, + projectId: route.query.projectId, + } console.log('重新提交params', params) resubmitCheck(params).then(res => { ElNotification({ diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue index 75f517f..0c63525 100644 --- a/src/views/project-management/implementation/detail.vue +++ b/src/views/project-management/implementation/detail.vue @@ -11,19 +11,32 @@ v-model:value="auditOpinion" /> - + - + :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow" + v-model:value="auditOpinion"/> + + + + + + + + + - + diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index f52133f..d8e6dc4 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -360,7 +360,7 @@ const handleShare = (row) => { router.push({ name: 'Implementation/share', query: { - id: row.requirementId + id: row.projectId } }) } diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue index c1e1d87..8cb8763 100644 --- a/src/views/project-management/implementation/share.vue +++ b/src/views/project-management/implementation/share.vue @@ -10,6 +10,7 @@ diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue index 1465208..eceacdb 100644 --- a/src/views/project-management/initiation/apply.vue +++ b/src/views/project-management/initiation/apply.vue @@ -181,16 +181,7 @@ const handleResubmit = async () => { files.push(getFileParam(item)) }) } - - let params = { - deploymentId: deploymentId.value, - requirementId: route.query.id, - fileList: files, - singleFile: formData.value.singleFile, - projectId: route.query.projectId, - } - console.log('params', params, attachment.value.isSingleFile) - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -198,9 +189,17 @@ const handleResubmit = async () => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + deploymentId: deploymentId.value, + requirementId: route.query.id, + fileList: files, + singleFile: attachment.value.singleFile, + projectId: route.query.projectId, + } + console.log('params', params, attachment.value.isSingleFile) let res = await resubmitApply(params) ElNotification({ title: '提示',