From 7c2d713035df143275681b5e936423051a819629 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Wed, 28 May 2025 23:01:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(components):=20=E4=BC=98=E5=8C=96=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E6=98=BE=E7=A4=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ApprovalDetail组件中，改进了多个字段的显示逻辑，增加了对 0值的处理 - 在 AttachmentUpload 组件中，调整了必填项的显示逻辑 - 在 ProjectApply 组件中，修改了前置流程字段的显示条件 - 在 upload 组件中，优化了文件列表的处理逻辑 --- src/components/AttachmentUpload.vue | 2 +- .../DetailComponent/ApprovalDetail.vue | 24 +++++++++---------- .../DetailComponent/ProjectApply.vue | 2 +- .../implementation/upload.vue | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) 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 953c33e..a3914b2 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -140,7 +140,7 @@ @cancelOrClear="optionalChargeLeaderPickerCancel"/> - + 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