odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/views/project-demand/requirement/detail.vue
This commit is contained in:
clay
2024-06-02 17:39:20 +08:00
parent 3ed5068dee 918a02b201
commit eebb3003c7
23 changed files with 150 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -103,7 +103,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
<el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" v-if="localFormData.isSpecialFund!==null||localFormData.isSpecialFund">
<span>{{ localFormData.specialFundAmount }}</span>
</el-form-item>
</el-col>