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

Merge pull request 'fix : 修复年度计划详情展示' (#513) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/513
This commit is contained in:
odjbin
2024-07-09 11:35:25 +00:00
parent 9f06ecbc62 7a38c34da9
commit cbc97891b8
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/views/plan/detail.vue
View File

@@ -21,14 +21,16 @@
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button> <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
<el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0" @click="editBtn">编辑</el-button> <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0"
@click="editBtn">编辑
</el-button>
</div> </div>
<el-table ref="table" :data="formData.projectList" border :header-cell-style="{background:'#f5f7fa'}"> <el-table ref="table" :data="formData.projectList" border :header-cell-style="{background:'#f5f7fa'}">
<el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表" align="center"> <el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表" align="center">
<template #default="scope"> <template #default="scope">
<el-table-column type="index" label="序号" align="center" width="60"/> <el-table-column type="index" label="序号" align="center" width="60"/>
<el-table-column prop="projectName" label="项目名称" align="center"/> <el-table-column prop="projectName" label="项目名称" align="center" width="100"/>
<el-table-column prop="time" label="起始时间" align="center" min-width="120px"> <el-table-column prop="time" label="起始时间" align="center" width="100">
<template #default="scope"> <template #default="scope">
{{ scope.row.startTime + ' 至 ' + scope.row.endTime }} {{ scope.row.startTime + ' 至 ' + scope.row.endTime }}
</template> </template>
@@ -41,7 +43,7 @@
<div v-else>--</div> <div v-else>--</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="departmentName" label="承办部门" align="center"/> <el-table-column prop="departmentName" label="承办部门" align="center" width="90"/>
<el-table-column prop="investmentType" label="出资类型" align="center"> <el-table-column prop="investmentType" label="出资类型" align="center">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.investmentType !== null"> <div v-if="scope.row.investmentType !== null">
@@ -50,7 +52,7 @@
<div v-else>--</div> <div v-else>--</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="projectImpact" label="项目影响" align="center"> <el-table-column prop="projectImpact" label="项目影响" align="center" width="90">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.projectImpact !== null"> <div v-if="scope.row.projectImpact !== null">
<Tag dictType="project_impact" :value="scope.row.projectImpact"/> <Tag dictType="project_impact" :value="scope.row.projectImpact"/>
@@ -58,7 +60,7 @@
<div v-else>--</div> <div v-else>--</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="businessSegment" label="所属业务板块" align="center"> <el-table-column prop="businessSegment" label="所属业务板块" align="center" width="110">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.businessSegment !== null"> <div v-if="scope.row.businessSegment !== null">
<Tag dictType="business_segment" :value="scope.row.businessSegment"/> <Tag dictType="business_segment" :value="scope.row.businessSegment"/>
@@ -69,10 +71,7 @@
<el-table-column prop="resultForm" label="预期成果形式" align="center" min-width="100px"> <el-table-column prop="resultForm" label="预期成果形式" align="center" min-width="100px">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.resultForm !== null"> <div v-if="scope.row.resultForm !== null">
<el-tag effect="plain">{{ <Tag style="margin-top: 3px" dictType="result_form" v-for="item in scope.row.resultForm" :value="item"/>
filterDict(cacheStore.getDict('result_form'), scope.row.resultForm)
}}
</el-tag>
</div> </div>
<div v-else>--</div> <div v-else>--</div>
</template> </template>
@@ -101,6 +100,17 @@
<div v-else>--</div> <div v-else>--</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="prospectiveIntellectualProperty" label="预期知识产权" align="center" width="190">
<template #default="scope">
<div style="text-align: left">
发明专利（{{ scope.row.inventionPatent ? scope.row.inventionPatent : 0 }}）项，<br>
实用新型专利（{{ scope.row.newPatent ? scope.row.newPatent : 0 }}）项，<br>
软件著作权（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
著作权（{{ scope.row.copyright ? scope.row.copyright : 0 }}）项，<br>
其他（{{ scope.row.other ? scope.row.other : 0 }}）项，
</div>
</template>
</el-table-column>
<el-table-column prop="intellectualProperty" label="知识产权状况" align="center"> <el-table-column prop="intellectualProperty" label="知识产权状况" align="center">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.intellectualProperty !== null"> <div v-if="scope.row.intellectualProperty !== null">