Skip to content

Y
yn-science-front
Commit dfeb92bf authored by wangxl's avatar wangxl
Browse files
Options

444

parent aec8cea9
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 113 deletions
src/views/report/project/components/cooperativeUnitsInfo.vue
View file @ dfeb92bf
......@@ -15,11 +15,11 @@
</a-col>
<a-col :span="22" class="bg-gray">
<div class="special-middle">
<div >单位名称</div>
<div>单位名称</div>
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in dataList" :key="'cooperativeUnits'+index" type="flex" class="row_center">
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperativeUnits'+index" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>
......@@ -42,21 +42,21 @@
export default {
name: 'cooperativeUnitsInfo',
components: {
},
data () {
return {
}
},
props: {
dataList: {
cooperativeUnits: {
type: Array,
default: () => {
return []
}
},
},
components: {
},
created () {
......
src/views/report/project/components/projectEdit.vue
View file @ dfeb92bf
......@@ -440,6 +440,20 @@
<!-- 分年度用款计划 -->
<fund-plan-edit :fundPlan.sync="formData.fundPlan" />
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="main-title">
<span>申请书正文</span>
</div>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<div>
</div>
</a-col>
</a-row>
<!-- 附件 -->
<file-edit :fileList.sync="formData.fileList" />
</a-form-model>
......
src/views/report/project/components/projectInfo.vue
View file @ dfeb92bf
......@@ -118,7 +118,7 @@
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div class="required">每年工作时间(月)</div>
<div>每年工作时间(月)</div>
</div>
</a-col>
<a-col :span="5">
......@@ -160,7 +160,7 @@
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div class="required">主要研究领域</div>
<div>主要研究领域</div>
</div>
</a-col>
<a-col :span="21">
......@@ -194,7 +194,7 @@
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">联系人</div>
<div>联系人</div>
</div>
</a-col>
<a-col :span="8">
......@@ -206,7 +206,7 @@
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">电话</div>
<div>电话</div>
</div>
</a-col>
<a-col :span="8">
......@@ -220,7 +220,7 @@
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">电子信箱</div>
<div>电子信箱</div>
</div>
</a-col>
<a-col :span="8">
......@@ -232,7 +232,7 @@
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">传真</div>
<div>传真</div>
</div>
</a-col>
<a-col :span="8">
......@@ -257,114 +257,136 @@
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项目名称</div>
<div>项目名称</div>
</div>
</a-col>
<a-col :span="20">
{{ value.projName }}
<div class="special-middle">
{{ value.projName }}
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">学科代码</div>
<div>学科代码</div>
</div>
</a-col>
<a-col :span="20">
{{ value.knowledgeName }}
<div class="special-middle">
{{ value.knowledgeName }}
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">选题范围</div>
<div>选题范围</div>
</div>
</a-col>
<a-col :span="8">
{{ value.subjectScope }}
<div class="special-middle">
{{ value.subjectScope }}
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项目类别</div>
<div>项目类别</div>
</div>
</a-col>
<a-col :span="8">
{{ value.projClass }}
<div class="special-middle">
{{ value.projClass }}
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">附注说明</div>
<div>附注说明</div>
</div>
</a-col>
<a-col :span="20">
{{ value.remark }}
<div class="special-middle">
{{ value.remark }}
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项日开始时间</div>
<div>项日开始时间</div>
</div>
</a-col>
<a-col :span="8">
{{ value.startDate }}
<div class="special-middle">
{{ moment(value.startDate).format('YYYY-MM-DD') }}
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项目结束时间</div>
<div>项目结束时间</div>
</div>
</a-col>
<a-col :span="8">
{{ value.endDate }}
<div class="special-middle">
{{ moment(value.endDate).format('YYYY-MM-DD') }}
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项目总经费(万元）</div>
<div>项目总经费(万元）</div>
</div>
</a-col>
<a-col :span="8">
{{ value.totalFunding }} 万元
<div class="special-middle">
{{ value.totalFunding }} 万元
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">申请经费(万元)</div>
<div>申请经费(万元)</div>
</div>
</a-col>
<a-col :span="8">
{{ value.govFunding }} 万元
<div class="special-middle">
{{ value.govFunding }} 万元
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项目摘要(400字以内)</div>
<div>项目摘要(400字以内)</div>
</div>
</a-col>
<a-col :span="20">
<div v-html="toTextarea(value.projAbstract)"></div>
<div class="special-middle">
<div v-html="toTextarea(value.projAbstract)"></div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">关键词</div>
<div>关键词</div>
</div>
</a-col>
<a-col :span="20">
{{ value.projKeywords }}
<div class="special-middle">
{{ value.projKeywords }}
</div>
</a-col>
</a-row>
</div>
<div v-if="tabsData[2].isShow">
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<div class="main-title">
<span>项目人员情况</span>
</div>
</a-col>
......@@ -372,7 +394,13 @@
<!-- 项目组成员 -->
<project-member-info :dataList.sync="value.members" />
<a-row type="flex">
<a-col :span="24" style="text-align: center;">
<div class="special-middle">
&nbsp;
</div>
</a-col>
</a-row>
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
......@@ -541,6 +569,7 @@ export default {
{ title: '附件信息', key: '6', isShow: true },
{ title: '项目审核记录', key: '7', isShow: true },
]
console.log(this.value)
},
mounted () {
},
......
src/views/report/project/components/projectMemberInfo.vue
View file @ dfeb92bf
......@@ -3,7 +3,7 @@
<a-row>
<a-col :span="24">
<div class="tb-title">
<span>项目组成员 <strong>(注：项目负责人填写到第一行)</strong></span>
<span>项目组主要成员 <strong style="color: red;">(注：不包含项目申请人)</strong></span>
</div>
</a-col>
</a-row>
......@@ -18,29 +18,24 @@
<div>姓名</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>性别</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>出生年月</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>证件号码</div>
<div>性别</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>民族</div>
<div>职称</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>国别或地区</div>
<div>学位</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
......@@ -48,37 +43,22 @@
<div>工作单位</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>职称</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>最高学位</div>
<div>电话</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>电子邮箱</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>手机</div>
</div>
</a-col>
<!-- <a-col :span="1" class="bg-gray">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div >电话</div>
<div>证件号码</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div >传真</div>
</div>
</a-col> -->
<a-col :span="3" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>项目分工</div>
</div>
......@@ -88,9 +68,9 @@
<div>每年工作（月）</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<a-col :span="5" class="bg-gray">
<div class="special-middle">
<div>从事专业</div>
<div>个人简历</div>
</div>
</a-col>
</a-row>
......@@ -113,35 +93,28 @@
<a-col :span="1">
<div class="special-middle">
<div>
{{ item.sex }}
{{ moment(item.birthday).format('YYYY-MM') }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ moment(item.birthday).format('YYYY-MM-DD') }}
</div>
</div>
</a-col>
<a-col :span="3">
<div class="special-middle">
<div>
{{ item.certId }}
{{ item.sex }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ item.nationName }}
{{ item.titleName }}
</div>
</div>
</a-col>
<a-col :span="2">
<a-col :span="1">
<div class="special-middle">
<div>
{{ item.country }}
{{ item.degreeName }}
</div>
</div>
</a-col>
......@@ -152,49 +125,28 @@
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ item.titleName }}
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="2">
<div class="special-middle">
<div>
{{ item.degreeName }}
{{ item.mobile }}
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="2">
<div class="special-middle">
<div>
{{ item.email }}
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="3">
<div class="special-middle">
<div>
{{ item.mobile }}
{{ item.certId }}
</div>
</div>
</a-col>
<!-- <a-col :span="1">
<div class="special-middle">
<div>
{{ item.telephone }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ item.fax }}
</div>
</div>
</a-col> -->
<a-col :span="3">
<a-col :span="2">
<div class="special-middle">
<div>
{{ item.projWork }}
......@@ -208,11 +160,12 @@
</div>
</div>
</a-col>
<a-col :span="2">
<a-col :span="5">
<div class="special-middle">
<div>
{{ item.specName }}
<div v-if="item.fileName" style="text-align: left;">
<document-view :fileUrl="item.downloadUrl" :fileName="item.fileName" :imageArray="[item.downloadUrl]"></document-view>
</div>
<div v-else>无</div>
</div>
</a-col>
</a-row>
......@@ -239,7 +192,7 @@ export default {
},
},
components: {
},
created () {
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment