fix : 修复需求上报的专项资金显示问题

This commit is contained in:
2024-06-06 19:50:46 +08:00
parent 781b4cfb96
commit 6a0c3570f6
2 changed files with 17 additions and 16 deletions

View File

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

View File

@@ -8,25 +8,25 @@
<el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input> <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5" v-if="!route.query.id">
<el-form-item label="是否专项资金" prop="isSpecialFund"> <el-form-item label="是否专项资金" prop="isSpecialFund" >
<el-radio-group v-model="formData.isSpecialFund"> <el-radio-group v-model="formData.isSpecialFund">
<el-radio :label="true"></el-radio> <el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio> <el-radio :label="false"></el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="formData.isSpecialFund?(!route.query.id?6:12):6">
<el-form-item label="专项资金" prop="specialFund" v-if="formData.isSpecialFund"> <el-form-item label="专项资金" prop="specialFund" v-if="formData.isSpecialFund">
<!-- <span>{{ getSpecialFundName(formData.specialFund) }}</span>--> <span v-if="route.query.id">{{ getSpecialFundName(formData.specialFund) }}</span>
<el-select v-model="formData.specialFund" placeholder="请选择专项资金" clearable filterable> <el-select v-else v-model="formData.specialFund" placeholder="请选择专项资金" clearable filterable>
<el-option <el-option
v-for="item in specialFundOption" v-for="item in specialFundOption"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -238,7 +238,7 @@
<!-- </div>--> <!-- </div>-->
</div> </div>
<div class="oper-page-btn"> <div class="oper-page-btn">
<!-- <el-button type="info" @click="staging">存为草稿</el-button>--> <!-- <el-button type="info" @click="staging">存为草稿</el-button>-->
<el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button> <el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button> <el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button>
</div> </div>
@@ -274,6 +274,7 @@ const showTable = ref(true)
const otherFileList = ref([]) const otherFileList = ref([])
const file = ref({}) const file = ref({})
const formData = ref({ const formData = ref({
isSpecialFund: false,
industryUniversityResearch: '0', industryUniversityResearch: '0',
governmentDeclaration: '0', governmentDeclaration: '0',
}) })
@@ -417,7 +418,7 @@ const handleSubmit = debounce(async (instance) => {
// } // }
let params = { let params = {
...formData.value, ...formData.value,
isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false, isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false,
deploymentId: deploymentId.value, deploymentId: deploymentId.value,
fileList: otherFiles, fileList: otherFiles,
singleFile: singleFile, singleFile: singleFile,
@@ -472,7 +473,7 @@ const handleResubmit = debounce(() => {
//todo requirementId //todo requirementId
let params = { let params = {
...formData.value, ...formData.value,
isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false, isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false,
deploymentId: deploymentId.value, deploymentId: deploymentId.value,
fileList: otherFiles, fileList: otherFiles,
singleFile: singleFile, singleFile: singleFile,