Skip to content

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

33

parent c7b54c58
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 134 deletions
src/views/report/project/Index.vue
View file @ 23317b61
......@@ -207,14 +207,6 @@ export default {
isButten: false,
display: true,
description: '',
// downloadUrl: '/downloadFile/202306151700.docx',
// fileName: '项目申报流程.docx',
// downloadUrl: '/downloadFile/ExpertInfo.xlsx',
// fileName: '专家导入模板.xlsx',
// downloadUrl: '/downloadFile/202406261130.pdf',
// fileName: '系统用户手册.pdf',
// downloadUrl: '/downloadFile/1637631492.jpg',
// fileName: '1637631492.jpg',
url1: {
downloadUrl: '/downloadFile/202406261120.doc',
fileName: '项目合同书模板.doc',
......
src/views/report/project/components/projectEdit.vue
View file @ 23317b61
......@@ -283,71 +283,6 @@
<!-- 项目合作单位 -->
<cooperative-units-edit :cooperativeUnits.sync="formData.cooperativeUnits" />
<!-- <a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">上年度研发经费支出总额(单位:万元)</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
<div>
<a-form-model-item prop="researchTotal">
<a-input-number v-model="formData.researchTotal" :min="0" :step="0.01" style="width: 100px" />
</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 class="required">上年度是否填报了研发活动情况</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
<div>
<a-form-model-item prop="isResearchActive">
<base-select v-model="formData.isResearchActive" :type="12" :isAll="true" />
</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 class="required">上一年度填报的研发投入总数(单位:万元)</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
<div>
<a-form-model-item prop="researchCount">
<a-input-number v-model="formData.researchCount" :min="0" :step="0.01" style="width: 100px" />
</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 class="required">上一年度填报的研发人员数</div>
</div>
</a-col>
<a-col :span="20">
<div class="special-middle">
<div>
<a-form-model-item prop="researchPersonCount">
<a-input-number v-model="formData.researchPersonCount" :min="0" :step="1" style="width: 100px" />
</a-form-model-item>
</div>
</div>
</a-col>
</a-row> -->
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
......@@ -367,30 +302,7 @@
</a-form-model-item>
</a-col>
</a-row>
<!-- <a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项目所属二级学院/部门名称(牵头单位)</div>
</div>
</a-col>
<a-col :span="20">
<a-form-model-item prop="leadUnit">
<a-input placeholder="项目所属二级学院/部门名称(牵头单位)" v-model="formData.leadUnit" :maxLength="100" style="width: 80%" />
</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>
</a-col>
<a-col :span="20">
<div class="special-middle">
<div>{{ formData.appUnitName }}</div>
</div>
</a-col>
</a-row> -->
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
......@@ -516,20 +428,17 @@
</div>
</a-col>
</a-row>
<!-- 项目组成员 -->
<project-member-edit :dataList.sync="formData.members" />
<!-- 项目绩效指标 -->
<project-kpi-edit :projectKPI.sync="formData.projectKPI" />
<!-- 经费预算 -->
<budget-edit :budget.sync="formData.budget" />
<!-- 分年度用款计划 -->
<fund-plan-edit :fundPlan.sync="formData.fundPlan" />
<!-- 设备费-购置设备预算明细表 -->
<equipments-edit :equipments.sync="formData.equipments" />
<!-- 科技计划项目承担单位研究资金支出预算明细表 -->
<unit-payment-edit :unitPayment.sync="formData.unitPayment" />
<!-- 项目绩效指标 -->
<project-kpi-edit :projectKPI.sync="formData.projectKPI" />
<!-- 附件 -->
<file-edit :fileList.sync="formData.fileList" />
......@@ -541,15 +450,9 @@
import { getType } from '@/views/utils/auth'
import projectMemberEdit from '@/views/report/project/components/projectMemberEdit'
import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit'
import participateUnitsEdit from '@/views/report/project/components/participateUnitsEdit'
import budgetEdit from '@/views/report/project/components/budgetEdit'
import fundPlanEdit from '@/views/report/project/components/fundPlanEdit'
import equipmentsEdit from '@/views/report/project/components/equipmentsEdit.vue'
import unitPaymentEdit from '@/views/report/project/components/unitPaymentEdit.vue'
import projectKpiEdit from '@/views/report/project/components/projectKpiEdit.vue'
import projectResearchEdit from '@/views/report/project/components/projectResearchEdit'
import projectSubEdit from '@/views/report/project/components/projectSubEdit'
import managementRuleEdit from '@/views/report/project/components/managementRuleEdit'
import fileEdit from '@/views/report/project/components/fileEdit'
import { isEmptyParams } from "@/views/utils/common"
import moment from 'moment'
......@@ -561,7 +464,6 @@ const ProjectSub = { projName: null, undertakingUnit: null, address: null, direc
const Cooperative = { id: null, unitName: null }
const ParticipateUnit = { id: null, unitName: null, unitCountry: null, unitAddress: null, organizationCode: null, projectWork: null }
const Equipment = { id: "", objectId: "", name: "", functionTarget: "", specificationType: "", quantity: 1, totalBudget: 0.00, useFrom: "", buyUnit: "", storageLocation: "", equipmentType: "", manufacturer: "", sharedScope: "", unitPrice: 0.00, }
const File = { fileName: '', downloadUrl: '', fileExplain: '', downloadId: '' }
const projectKPI = {
......@@ -603,7 +505,7 @@ const projectKPI = {
export default {
name: 'projectEdit',
components: {
projectMemberEdit, cooperativeUnitsEdit, participateUnitsEdit, budgetEdit, fundPlanEdit, equipmentsEdit, unitPaymentEdit, projectKpiEdit, projectResearchEdit, projectSubEdit, managementRuleEdit, fileEdit
projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit
},
props: {
value: {
......@@ -668,7 +570,6 @@ export default {
projectKPI: projectKPI,
unitPayment: [],
cooperativeUnits: [],
participateUnits: [],
members: [],
budget: [],
fundPlan: [],
......@@ -758,31 +659,12 @@ export default {
}
},
loadList () {
if (!!!this.formData.participateUnits || this.formData.participateUnits.length == 0)
this.formData.participateUnits = [{ ...ParticipateUnit }]
if (!!!this.formData.cooperativeUnits || this.formData.cooperativeUnits.length == 0)
this.formData.cooperativeUnits = [{ ...Cooperative }, { ...Cooperative }]
if (!!!this.formData.projectResearchList || this.formData.projectResearchList.length == 0)
this.formData.projectResearchList = [{ ...ProjResearch }]
if (!!!this.formData.managementRuleList || this.formData.managementRuleList.length == 0)
this.formData.managementRuleList = [{ ...ManagementRule }]
if (!!!this.formData.projectSubList || this.formData.projectSubList.length == 0)
this.formData.projectSubList = [{ ...ProjectSub }]
if (!!!this.formData.members || this.formData.members.length == 0)
this.formData.members = []
if (!!!this.formData.equipments || !this.formData.equipments.length || this.formData.equipments.length == 0) {
this.formData.equipments = []
}
if (!!!this.formData.unitPayment || !this.formData.unitPayment.length || this.formData.unitPayment.length == 0) {
this.formData.unitPayment = []
}
if (!!!this.formData.fileList || !this.formData.fileList.length || this.formData.fileList.length == 0) {
this.formData.fileList = []
}
......@@ -862,10 +744,10 @@ export default {
this.formData.projectKPI.projDeadline = projDeadline
}
},
totalFundingChange() {
totalFundingChange () {
this.formData.projectKPI.totalBudget = this.formData.totalFunding
},
govFundingChange() {
govFundingChange () {
this.formData.projectKPI.applyFunds = this.formData.govFunding
}
},
......
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