Skip to content

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

333

parent e37dc934
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 45 deletions
src/views/report/project/components/cooperativeUnitsEdit.vue
View file @ d05850d8
......@@ -8,12 +8,12 @@
</a-col>
</a-row>
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<a-col :span="5" class="bg-gray">
<div class="special-middle">
<div class="required">单位名称</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div class="required">单位国别</div>
</div>
......@@ -28,19 +28,19 @@
<div class="required">组织机构代码/统社会信用代码</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div class="required">分 工</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>操作</div>
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperativeUnits'+index" type="flex" class="row_center">
<a-col :span="4">
<a-col :span="5">
<div class="special-middle">
<div>
<a-form-model-item :prop="'cooperativeUnits.' + index + '.unitName'" :rules="{ required: true,message: '*',trigger: 'blur',}">
......@@ -49,7 +49,7 @@
</div>
</div>
</a-col>
<a-col :span="4">
<a-col :span="3">
<div class="special-middle">
<div>
<a-form-model-item :prop="'cooperativeUnits.' + index + '.unitCountry'" :rules="{ required: true,message: '*',trigger: 'blur',}">
......@@ -76,7 +76,7 @@
</div>
</div>
</a-col>
<a-col :span="4">
<a-col :span="6">
<div class="special-middle">
<div>
<a-form-model-item :prop="'cooperativeUnits.' + index + '.projectWork'" :rules="{ required: true,message: '*',trigger: 'blur',}">
......@@ -85,7 +85,7 @@
</div>
</div>
</a-col>
<a-col :span="4">
<a-col :span="2">
<div class="special-middle">
<a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="removeArray(item)">
<a-button type="link" size="small">[删除]</a-button>
......
src/views/report/project/components/cooperativeUnitsInfo.vue
View file @ d05850d8
......@@ -8,7 +8,7 @@
</a-col>
</a-row>
<a-row type="flex" class="row_center">
<a-col :span="1" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
</div>
......@@ -18,12 +18,12 @@
<div >单位名称</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div >单位国别</div>
</div>
</a-col>
<a-col :span="6" class="bg-gray">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div >单位地址</div>
</div>
......@@ -33,14 +33,14 @@
<div >组织机构代码/统社会信用代码</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div >分 工</div>
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in dataList" :key="'cooperativeUnits'+index" type="flex" class="row_center">
<a-col :span="1">
<a-col :span="2">
<div class="special-middle">
<div>
{{ index + 1 }}
......@@ -54,14 +54,14 @@
</div>
</div>
</a-col>
<a-col :span="4">
<a-col :span="3">
<div class="special-middle">
<div>
{{ item.unitCountry }}
</div>
</div>
</a-col>
<a-col :span="6">
<a-col :span="4">
<div class="special-middle">
<div>
{{ item.unitAddress }}
......@@ -75,7 +75,7 @@
</div>
</div>
</a-col>
<a-col :span="4">
<a-col :span="6">
<div class="special-middle">
<div>
{{ item.projectWork }}
......
src/views/report/project/components/projectEdit.vue
View file @ d05850d8
......@@ -2,8 +2,8 @@
<div>
<a-form-model ref="form" :model="formData" :rules="rules" style="border-top: 0px" class="from-table font-line-space">
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<a-col :span="24" style="border-top: 0px;text-align: center;">
<div class="main-title">
<span>基本情况</span>
</div>
</a-col>
......@@ -326,14 +326,13 @@
<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">
{{ formData.appUnitName }}
<!-- <a-form-model-item prop="recommendUnit">
<a-input placeholder="推荐部门" v-model="formData.recommendUnit" :maxLength="100" style="width: 80%" />
</a-form-model-item> -->
<div class="special-middle">
<div>{{ formData.appUnitName }}</div>
</div>
</a-col>
</a-row>
<a-row type="flex">
......@@ -467,7 +466,7 @@
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<div class="main-title">
<span>项目人员情况</span>
</div>
</a-col>
......@@ -489,12 +488,12 @@
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">1、项目的意义、必要性</div>
<div class="required">1、立项依据、研究内容、意义及必要性</div>
</div>
</a-col>
<a-col :span="20">
<a-form-model-item prop="projContent">
<a-textarea placeholder="项目的意义、必要性" v-model="formData.projContent" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="立项依据、研究内容、意义及必要性" v-model="formData.projContent" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</a-form-model-item>
</a-col>
</a-row>
......@@ -506,14 +505,14 @@
</a-col>
<a-col :span="20">
<a-form-model-item prop="memResume">
<a-textarea placeholder="项目现有工作基础和支撑条件" v-model="formData.memResume" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="项目现有工作基础和支撑条件" v-model="formData.memResume" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<span>3、在研或完成基础研究项目情况</span>
<div class="tb-title ">
<span style="color: rgba(0, 0, 0, 0.65);">3、在研或完成基础研究项目情况</span>
</div>
</a-col>
</a-row>
......@@ -529,13 +528,13 @@
</a-col>
<a-col :span="20">
<a-form-model-item prop="researchProgress">
<a-textarea placeholder="与项目相关的国内外技术发展现状" v-model="formData.researchProgress" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="与项目相关的国内外技术发展现状" v-model="formData.researchProgress" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24" style="border-top: 0px">
<div class="tb-title">
<div class="main-title">
<span>项目主要实施内容和目标</span>
</div>
</a-col>
......@@ -548,7 +547,7 @@
</a-col>
<a-col :span="20">
<a-form-model-item prop="researchContent">
<a-textarea placeholder="项目实施目标" v-model="formData.researchContent" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="项目实施目标" v-model="formData.researchContent" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</a-form-model-item>
</a-col>
</a-row>
......@@ -567,7 +566,7 @@
</a-col>
<a-col :span="20">
<a-form-model-item prop="technologyTarget">
<a-textarea placeholder="主要技术指标" v-model="formData.technologyTarget" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="主要技术指标" v-model="formData.technologyTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</a-form-model-item>
</a-col>
</a-row>
......@@ -579,31 +578,31 @@
</a-col>
<a-col :span="20">
<a-form-model-item prop="economyTarget">
<a-textarea placeholder="主要经济指标" v-model="formData.economyTarget" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="主要经济指标" v-model="formData.economyTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</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>项目实施中形成的示范基地、中试线、生产线及其规模等</div>
</div>
</a-col>
<a-col :span="20">
<a-form-model-item prop="achievementTarget">
<a-textarea placeholder="项目实施中形成的示范基地、中试线、生产线及其规模等" v-model="formData.achievementTarget" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="项目实施中形成的示范基地、中试线、生产线及其规模等" v-model="formData.achievementTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</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>其他应考核的指标</div>
</div>
</a-col>
<a-col :span="20">
<a-form-model-item prop="otherTarget">
<a-textarea placeholder="其他应考核的指标" v-model="formData.otherTarget" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
<a-textarea placeholder="其他应考核的指标" v-model="formData.otherTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
</a-form-model-item>
</a-col>
</a-row>
......@@ -615,9 +614,9 @@
<!-- 设备费-购置设备预算明细表 -->
<equipments-edit :equipments.sync="formData.equipments" />
<!-- 科技计划项目承担单位研究资金支出预算明细表 -->
<unit-payment-edit :unitPayment.sync="formData.unitPayment"/>
<unit-payment-edit :unitPayment.sync="formData.unitPayment" />
<!-- 项目绩效指标 -->
<project-kpi-edit :projectKPI.sync="formData.projectKPI"/>
<project-kpi-edit :projectKPI.sync="formData.projectKPI" />
<!-- 项目课题设置 -->
<project-sub-edit :projectSubList.sync="formData.projectSubList" />
......@@ -805,8 +804,8 @@ export default {
researchContent: { required: true, message: '请填写项目实施目标', trigger: 'blur' },
technologyTarget: { required: true, message: '请填写主要技术指标', trigger: 'blur' },
economyTarget: { required: true, message: '请填写主要经济指标', trigger: 'blur' },
achievementTarget: [{ required: true, message: '请填写项目实施中形成的示范基地、中试线、生产线及其规模等', trigger: 'blur' },],
otherTarget: { required: true, message: '请填写其他应考核的指标', trigger: 'blur' },
achievementTarget: [{ required: false, message: '请填写项目实施中形成的示范基地、中试线、生产线及其规模等', trigger: 'blur' },],
otherTarget: { required: false, message: '请填写其他应考核的指标', trigger: 'blur' },
},
}
},
......@@ -866,7 +865,7 @@ export default {
this.formData.fileList = []
}
},
processProjectYearTarget() {
processProjectYearTarget () {
this.formData.yearTarget = this.formData.projectKPI.yearTarget
this.formData.year1Goal = this.formData.projectKPI.year1Goal
this.formData.year2Goal = this.formData.projectKPI.year2Goal
......@@ -929,10 +928,10 @@ export default {
return true
}
},
startDateChange(value, dateString) {
startDateChange (value, dateString) {
this.formData.projectKPI.startDate = this.formData.startDate
},
endDateChange(value, dateString) {
endDateChange (value, dateString) {
this.formData.projectKPI.endDate = this.formData.endDate
console.log(this.formData.projectKPI)
}
......
static/css/common.less
View file @ d05850d8
......@@ -200,6 +200,30 @@
}
}
.main-title {
color: #106ad8;
font-weight: 600;
font-size: 15px;
display: flex;
text-align: center;
line-height: 40px;
&::after {
content: "";
flex-grow: 1;
border-top: 1px dashed #d9d9d9;
transform: translateY(50%);
margin-left: 10px;
}
&::before {
content: "";
flex-grow: 1;
border-top: 1px dashed #d9d9d9;
transform: translateY(50%);
margin-left: 10px;
}
}
.flex-layout {
display: flex;
......
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