diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index efca74e..12e2991 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -10,6 +10,13 @@ + + + + + + + @@ -230,7 +237,7 @@ const pageInfo = reactive({ }) const rules = reactive({ actualEconomicEstimate: [{required: true, message: '请输入实际经费预算', trigger: ['blur','change']}], - // projectChargePerson: [{required: true, message: '请选择项目负责人', trigger: 'blur'}], + specialFundAmount: [{required: true, message: '请输入实际专项资金', trigger: 'blur'}], // projectPerson: [{required: true, message: '请选择项目成员', trigger: 'blur'}], }) const tagsViewStore = useTagsView() @@ -549,7 +556,8 @@ const handleSubmit = async (instance) => { fileList: files, // singleFile: attachment.value.singleFile, projectId: projectId.value, - actualEconomicEstimate: localFormData.value.actualEconomicEstimate, + actualEconomicEstimate: parseFloat(localFormData.value.actualEconomicEstimate), + specialFundAmount: parseFloat(localFormData.value.specialFundAmount), preProcess: JSON.stringify(localFormData.value.preProcess) } if (sessionParams.value.preProcess && !localFormData.value.preProcess) { diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index fa1d023..9035fc4 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -294,6 +294,22 @@ const schema = computed(() => { ) }, + { + label: '实际经费预算', + prop: 'actualEconomicEstimate', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.actualEconomicEstimate ? + {toThousands(baseFormData.value?.actualEconomicEstimate)} + : {'--'} + } +
+ ) + }, { label: '产学研联合', prop: 'industryUniversityResearch', @@ -335,6 +351,22 @@ const schema = computed(() => { }, { label: '预估专项资金(元)', + prop: 'forecastSpecialFundAmount', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.forecastSpecialFundAmount ? + {toThousands(baseFormData.value?.forecastSpecialFundAmount)} + : {'--'} + } +
+ ) + }, + { + label: '实际专项资金(元)', prop: 'specialFundAmount', colProps: { span: 6 diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue index bd5aed5..7a24eac 100644 --- a/src/views/expense-management/expend-detail/index.vue +++ b/src/views/expense-management/expend-detail/index.vue @@ -1,6 +1,6 @@