diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index d461f33..0b6a6c5 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -336,7 +336,15 @@ const getIsFund = async () => { } }) } - +const getFundName = (id) => { + let label='' + specialFundOption.value.forEach(item => { + if(item.value==id){ + label=item.label + } + }) + return label +} const compositeParam = (item, type) => { let tag = '' if (name.value === 'Summary/add' || name.value === 'Summary/edit') { @@ -354,11 +362,11 @@ const compositeParam = (item, type) => { } const getAttachment = (val) => { - console.log('上传文件getAttachment', val) + // console.log('上传文件getAttachment', val) formData.value.singleFile = compositeParam(val) } const getOtherFile = (val) => { - console.log('上传文件getOtherFile', val) + // console.log('上传文件getOtherFile', val) showTable.value = false let fileObj = compositeParam(val) otherFileList.value.push(fileObj) @@ -367,7 +375,6 @@ const getOtherFile = (val) => { }) } const getFileParam = (item) => { - console.log('item', item) if (item === undefined) return; return { fileId: item.fileId, @@ -397,7 +404,7 @@ const handleSubmit = debounce(async (instance) => { fileList: otherFiles, requirementId: route.query.id ? route.query.id : '-1' } - console.log('params', params) + // console.log('params', params) if (!attachment.value.isSingleFile) { attachment.value.validate() ElNotification({ @@ -441,13 +448,16 @@ const handleResubmit = debounce(() => { } else { attachment.value.clearValidate() } + if (formData.value.isSpecialFund&&formData.value.specialFund === null) { + formData.value.specialFund=getFundName(formData.value.specialFundId) + } let params = { ...formData.value, deploymentId: deploymentId.value, fileList: otherFiles, requirementId: route.query.id ? route.query.id : '-1' } - console.log('重新提交params', params) + // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId) resubmitReported(params).then(res => { ElNotification({ title: '提示', @@ -487,12 +497,12 @@ const init = async () => { specialFundOption.value = resFund.data const res = await getSubCompOpt() companyOption.value = res.data - await processInfo() + await processInfo() loading.value = false } const processInfo = () => { processStore.setDesign(null) - processDiagramViewer.value=false + processDiagramViewer.value = false getProcessInfo(formData.value.isSpecialFund).then(res => { if (res.code === 1000) { let data = res.data