diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 4e2e843..aa94a2a 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -22,7 +22,7 @@ - + 模板下载 diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index 8ca653c..8630253 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -302,7 +302,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualNewPatent ? props.formData.actualNewPatent : {'--'} + props.formData.actualNewPatent ? props.formData.actualNewPatent :props.formData.actualNewPatent==0?0: {'--'} }
) @@ -317,7 +317,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualSoftwareCopyright ? props.formData.actualSoftwareCopyright : {'--'} + props.formData.actualSoftwareCopyright ? props.formData.actualSoftwareCopyright : props.formData.actualSoftwareCopyright==0?0: {'--'} }
) @@ -332,7 +332,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualTechnicalNorms ? props.formData.actualTechnicalNorms : {'--'} + props.formData.actualTechnicalNorms ? props.formData.actualTechnicalNorms : props.formData.actualTechnicalNorms==0?0:{'--'} }
) @@ -347,7 +347,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualNewProduct ? props.formData.actualNewProduct : {'--'} + props.formData.actualNewProduct ? props.formData.actualNewProduct : props.formData.actualNewProduct==0?0:{'--'} }
) @@ -362,7 +362,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualNewProcess ? props.formData.actualNewProcess : {'--'} + props.formData.actualNewProcess ? props.formData.actualNewProcess : props.formData.actualNewProcess==0?0: {'--'} }
) @@ -377,7 +377,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualNewDevice ? props.formData.actualNewDevice : {'--'} + props.formData.actualNewDevice ? props.formData.actualNewDevice :props.formData.actualNewDevice==0?0: {'--'} }
) @@ -392,7 +392,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualNewMaterials ? props.formData.actualNewMaterials : {'--'} + props.formData.actualNewMaterials ? props.formData.actualNewMaterials : props.formData.actualNewMaterials==0?0: {'--'} }
) @@ -407,7 +407,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualComputerSoftware ? props.formData.actualComputerSoftware : {'--'} + props.formData.actualComputerSoftware ? props.formData.actualComputerSoftware : props.formData.actualComputerSoftware==0?0:{'--'} }
) @@ -422,7 +422,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualThesis ? props.formData.actualThesis : {'--'} + props.formData.actualThesis ? props.formData.actualThesis : props.formData.actualThesis==0?0:{'--'} }
) @@ -437,7 +437,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualResearchReport ? props.formData.actualResearchReport : {'--'} + props.formData.actualResearchReport ? props.formData.actualResearchReport : props.formData.actualResearchReport==0?0: {'--'} }
) @@ -452,7 +452,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualTrademark ? props.formData.actualTrademark : {'--'} + props.formData.actualTrademark ? props.formData.actualTrademark :props.formData.actualTrademark==0?0: {'--'} }
) @@ -467,7 +467,7 @@ const schema = computed(() => { component: () => (
{ - props.formData.actualOther ? props.formData.actualOther : {'--'} + props.formData.actualOther ? props.formData.actualOther : props.formData.actualOther==0?0: {'--'} }
) diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index 32faf70..a3914b2 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -140,7 +140,7 @@ @cancelOrClear="optionalChargeLeaderPickerCancel"/>
- + @@ -669,26 +669,26 @@ const handleSubmit = async (instance) => { if (props.step == 50) { let files = [] if (props.mode === 'resubmit') { - attachment.value.allFileList.forEach(item => { + attachment.value.allFileList?.forEach(item => { files.push(getFileParam(item)) }) } else { - otherFileList.value.forEach(item => { + otherFileList.value?.forEach(item => { files.push(getFileParam(item)) }) } // console.info("🚀 ~method:handleSubmit -----", files,attachment.value.isHaveOneFile) - if (!attachment.value.isHaveOneFile) { - attachment.value.validate() - ElNotification({ - title: '提示', - message: '请上传附件', - type: 'error' - }) - return; - } else { - attachment.value.clearValidate() - } + // if (!attachment.value.isHaveOneFile) { + // attachment.value.validate() + // ElNotification({ + // title: '提示', + // message: '请上传附件', + // type: 'error' + // }) + // return; + // } else { + // attachment.value.clearValidate() + // } let projectPersonIds = [] for (const item of projectPersonUserList.value) { projectPersonIds.push(parseInt(item.id)) @@ -696,7 +696,7 @@ const handleSubmit = async (instance) => { let params = { deploymentId: deploymentId.value, requirementId: route.query.id, - fileList: files, + fileList: files||[], // singleFile: attachment.value.singleFile, projectId: route.query.projectId, ...localFormData.value, diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue index 14b0b73..36d8ab1 100644 --- a/src/views/project-management/implementation/upload.vue +++ b/src/views/project-management/implementation/upload.vue @@ -458,7 +458,6 @@ const getOldFileList = (tag,flag) => { fileList.value.push(item) }) }else{ - console.log("🚀 ~ file:'res.data.fileList ",res.data.fileList ) res.data.fileList?.forEach(item=>{ item.oldType=true if(getTagName(activeName.value)==item.tag){ @@ -517,6 +516,7 @@ const tabRemove = async (val) => { } const handleTabClick = (item) => { + activeName.value = item.props.name const defaultArray=tagsOption.value.filter(item1=>item1.tagId==item.props.name) if(defaultArray&&defaultArray.length>0){ isDefault.value=defaultArray[0].isDefault==1