Skip to content

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

lllll

parent 02d0e1f7
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 151 deletions
src/views/report/task/components/taskCreate.vue
View file @ 69323b2f
......@@ -12,8 +12,8 @@
<task-edit v-model="value" @close="closeWindow" @load="onLoad" ref="taskCreate" :tabsData.sync="tabsData" />
</div>
<div class="page-footer">
<a-button type="primary" @click="save">保 存</a-button>
<a-button type="primary" style="margin-left: 40px" @click="submit">完成填写</a-button>
<a-button type="primary" @click="save" v-if="tabsData[0].isShow">保 存</a-button>
<a-button type="primary" style="margin-left: 40px" @click="submit" v-if="tabsData[0].isShow">完成填写</a-button>
</div>
</a-spin>
</div>
......
src/views/report/task/components/taskEdit.vue
View file @ 69323b2f
......@@ -1088,12 +1088,13 @@ import manufactureInfo from '@/views/report/project/components/manufactureInfo'
import projStageGoalsInfo from "@/views/report/project/components/projStageGoalsInfo";
import projectSubInfo from '@/views/report/project/components/projectSubInfo'
import fileInfo from "@/views/report/project/components/fileInfo";
import documentView from '@/views/components/common/documentView'
import { toTextarea } from '@/views/utils/common'
export default {
name: 'projectEdit',
components: {
cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, unitPaymentInfo, deviceInfo, manufactureInfo, fileInfo, projStageGoalsInfo, projectSubInfo, participateUnitsInfo
cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, unitPaymentInfo, deviceInfo, manufactureInfo, fileInfo, projStageGoalsInfo, projectSubInfo, participateUnitsInfo,documentView
},
props: {
value: {
......
src/views/report/task/components/taskInfo.vue
View file @ 69323b2f
......@@ -2,53 +2,70 @@
<div class="from-table font-line-space" v-if="tabsData[0].isShow">
<div v-if="tabsData[1].isShow">
<a-row>
<a-col :span="24" style="border-top: 0px;text-align: center;">
<div class="main-title">
<span>项目基本情况</span>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<span>单位基本情况</span>
</div>
</a-col>
</a-row>
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<span>申请人信息</span>
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>单位名称</div>
</div>
</a-col>
<a-col :span="21">
<div class="special-middle">
<div>
<a-form-model-item>
{{ value.appUnitName }}
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>姓名</div>
<div>注册单位类型</div>
</div>
</a-col>
<a-col :span="5">
<a-col :span="9">
<div class="special-middle">
<div>
{{ value.appPersonName }}
<a-form-model-item>
医疗机构
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>性别</div>
<div>组织机构代码/统一社会信用代码</div>
</div>
</a-col>
<a-col :span="5">
<a-col :span="9">
<div class="special-middle">
<div>
{{ value.sex }}
<a-form-model-item prop="organizationCode">
{{ value.organizationCode }}
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>出生日期</div>
<div>通讯地址</div>
</div>
</a-col>
<a-col :span="5">
<a-col :span="21">
<div class="special-middle">
<div>
{{ moment(value.birthday).format('YYYY-MM-DD') }}
<a-form-model-item prop="unitAddress">
{{ value.unitAddress }}
</a-form-model-item>
</div>
</div>
</a-col>
......@@ -56,37 +73,43 @@
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>民族</div>
<div>注册所在地(县/区)</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.nationName }}
<a-form-model-item prop="registeredAddress">
{{ value.registeredAddress }}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>学位</div>
<div>邮编</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.degreeName }}
<a-form-model-item prop="postCode">
{{ value.postCode }}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>职称</div>
<div>法定代表人</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.titleName }}
<a-form-model-item prop="legalPerson">
{{ value.legalPerson }}
</a-form-model-item>
</div>
</div>
</a-col>
......@@ -94,37 +117,43 @@
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>电话</div>
<div>职工总数</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.mobile }}
<a-form-model-item prop="workforce">
{{ value.workforce }}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>电子邮箱</div>
<div>其中专科以上人员</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.email }}
<a-form-model-item prop="specializedPersonnel">
{{ value.specializedPersonnel }}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>每年工作时间(月)</div>
<div>研究开发人员</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.jobTime }}
<a-form-model-item prop="researchPersonnel">
{{ value.researchPersonnel }}
</a-form-model-item>
</div>
</div>
</a-col>
......@@ -132,27 +161,29 @@
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>个人通讯地址</div>
<div>开户银行</div>
</div>
</a-col>
<a-col :span="21">
<a-col :span="9">
<div class="special-middle">
<div>
{{ value.address }}
<a-form-model-item prop="depositBank">
{{ value.depositBank }}
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>工作单位</div>
<div>银行账号</div>
</div>
</a-col>
<a-col :span="21">
<a-col :span="9">
<div class="special-middle">
<div>
{{ value.appUnitName }}
<a-form-model-item prop="bankAccount">
{{ value.bankAccount }}
</a-form-model-item>
</div>
</div>
</a-col>
......@@ -160,178 +191,181 @@
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>主要研究领域</div>
<div>开户银行地址</div>
</div>
</a-col>
<a-col :span="21">
<a-col :span="9">
<div class="special-middle">
<div>
<a-form-model-item prop="depositBankAddress">
{{ value.depositBankAddress }}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>银行联行号</div>
</div>
</a-col>
<a-col :span="9">
<div class="special-middle">
<div v-html="toTextarea(value.mainResearchAreas)"></div>
<div>
<a-form-model-item prop="interbankNumber">
{{ value.interbankNumber }}
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<span>申请单位信息</span>
<span>项目基本情况</span>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>单位名称</div>
<div>项目编号</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
<div>
{{ value.appUnitName }}
</div>
</div>
<a-form-model-item prop="projNo">
<div>{{ value.projNo }}</div>
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>联系人</div>
<div>项目名称</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
<div>
{{ value.unitLinkName }}
</div>
</div>
<a-col :span="20">
<a-form-model-item prop="projName">
<div>{{ value.projName }}</div>
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>电话</div>
<div>所属我省重点领域</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
<div>
{{ value.unitLinkMobile }}
</div>
</div>
<a-col :span="20">
<a-form-model-item prop="keyAreas">
{{ value.keyAreas }}
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>电子信箱</div>
<div>项日开始时间</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
<div>
{{ value.unitLinkEmail }}
</div>
</div>
<a-form-model-item prop="startDate" style="width:200px;display: inline-block;">
{{ value.startDate }}
</a-form-model-item>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>传真</div>
<div>项目结束时间</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
<div>
{{ value.unitLinkFax }}
</div>
</div>
</a-col>
</a-row>
<!-- 项目合作单位 -->
<!-- <cooperative-units-info :cooperativeUnits.sync="value.cooperativeUnits" /> -->
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<span>项目基本情况</span>
</div>
<a-form-model-item prop="endDate" style="width:200px;display: inline-block;">
{{ value.endDate }}
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>项目名称</div>
<div>项目负责人</div>
</div>
</a-col>
<a-col :span="20">
<a-col :span="8">
<div class="special-middle">
{{ value.projName }}
<div>
{{ value.appPersonName }}
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>学科代码</div>
<div>联系电话</div>
</div>
</a-col>
<a-col :span="20">
<a-col :span="8">
<div class="special-middle">
{{ value.knowledgeName }}
<div>
{{ value.mobile }}
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>选题范围</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
{{ value.subjectScope }}
</div>
</a-col>
<!-- <a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>项目类别</div>
<div>项目联系人姓名</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
{{ value.projClass }}
<div>
<a-form-model-item prop="unitLinkName">
{{ value.linkName }}
</a-form-model-item>
</div>
</div>
</a-col> -->
</a-row>
<a-row type="flex">
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>附注说明</div>
<div>联系人电话</div>
</div>
</a-col>
<a-col :span="20">
<a-col :span="8">
<div class="special-middle">
{{ value.remark }}
<div>
<a-form-model-item prop="unitLinkMobile">
{{ value.linkMobile }}
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>项日开始时间</div>
<div>传真</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
{{ moment(value.startDate).format('YYYY-MM-DD') }}
<div>
<a-form-model-item prop="unitLinkFax">
{{ value.linkFax }}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>项目结束时间</div>
<div>电子信箱</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
{{ moment(value.endDate).format('YYYY-MM-DD') }}
<div>
<a-form-model-item prop="unitLinkEmail">
{{ value.linkEmail }}
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
......@@ -339,46 +373,64 @@
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>项目总经费(万元）</div>
<div>项目总经费（万元）</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
{{ value.totalFunding }} 万元
<div>
<a-form-model-item prop="isTechnologyReport">
{{value.totalFunding}}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>申请经费(万元)</div>
<div>财政经费（万元）</div>
</div>
</a-col>
<a-col :span="8">
<div class="special-middle">
{{ value.govFunding }} 万元
<div>
<a-form-model-item prop="isTechnologyReport">
{{value.govFunding}}
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>项目摘要(400字以内)</div>
<div>是否科技报告</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
<div v-html="toTextarea(value.projAbstract)"></div>
<div>
<a-form-model-item prop="isTechnologyReport">
<span v-if="value.isTechnologyReport==1">是</span>
<span v-else>否</span>
</a-form-model-item>
</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>关键词</div>
<div>科技报告类型</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
{{ value.projKeywords }}
<div>
<span style="margin:0 6px 0 6px;">立项报告</span>{{ value.projectReport }}
<span style="margin:0 6px 0 24px;">进展报告</span>{{ value.progressReport }}
<span style="margin:0 6px 0 24px;">专题报告</span>{{ value.specialReport }}
<span style="margin:0 6px 0 24px;">最终报告</span>{{ value.finalReport }}
</div>
</div>
</a-col>
</a-row>
......@@ -503,51 +555,51 @@
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>学位</div>
<div>项目分工</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.degreeName }}
</div>
</div>
<a-form-model-item prop="projWork">
{{ value.projWork }}
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>职务</div>
<div>学位</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.dutyName }}
{{ value.degreeName }}
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>电话</div>
<div>职务</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.mobile }}
{{ value.dutyName }}
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>电子邮箱</div>
<div>传真</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.email }}
<a-form-model-item prop="fax">
{{ value.fax }}
</a-form-model-item>
</div>
</div>
</a-col>
......@@ -555,37 +607,39 @@
<a-row type="flex">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>个人通讯地址</div>
<div>手机</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.address }}
{{ value.mobile }}
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>工作单位</div>
<div>联系电话</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.appUnitName }}
<a-form-model-item prop="telephone">
{{ value.telephone }}
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>每年工作时间(月)</div>
<div>电子邮箱</div>
</div>
</a-col>
<a-col :span="5">
<div class="special-middle">
<div>
{{ value.jobTime }}
{{ value.email }}
</div>
</div>
</a-col>
......
src/views/report/task/components/taskView.vue
View file @ 69323b2f
......@@ -66,15 +66,15 @@ export default {
tabsData: [
{ title: '全部', key: '0', isShow: true },
{ title: '项目基本信息', key: '1', isShow: true },
{ title: '项目组主要成员', key: '2', isShow: true },
{ title: '项目人员情况', key: '2', isShow: true },
{ title: '项目主要实施内容和目标', key: '3', isShow: true },
{ title: '申请书正文', key: '4', isShow: true },
{ title: '申请书正文', key: '4', isShow: true },
{ title: '经费预算及设备明细', key: '5', isShow: true },
{ title: '项目实施阶段及任务', key: '6', isShow: true },
{ title: '项目课题设置', key: '7', isShow: true },
{ title: '绩效目标表', key: '8', isShow: true },
{ title: '绩效目标表', key: '8', isShow: true },
{ title: '附件信息', key: '9', isShow: true },
{ title: '项目审核记录', key: '10', isShow: true },
{ title: '审核记录', key: '10', isShow: true },
],
formData: {
id: null,
......@@ -131,13 +131,13 @@ export default {
},
},
created () {
this.getProjectInfoById()
this.getTaskByProjId()
},
methods: {
getProjectInfoById () {
getTaskByProjId () {
if (this.value != null) {
this.loading = true
this.$api.project.getProjectInfoById({ id: this.value }).then(({ data = {} }) => {
this.$api.task.getTaskByProjId({ id: this.value }).then(({ data = {} }) => {
if (data) {
this.formData = data
this.loading = false
......
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