diff --git a/src/views/evaluation/components/economy.vue b/src/views/evaluation/components/economy.vue
index de79026a18150ddbc821caa9b6a0f48a6daf4917..01598952f87fa2842929c714d06267aeb0681990 100644
--- a/src/views/evaluation/components/economy.vue
+++ b/src/views/evaluation/components/economy.vue
@@ -1,5 +1,5 @@
<template>
- <div style="height:75vh;overflow:auto" class="app-content">
+ <div>
<!-- <a-form-model ref="form" :model="value" :rules="rules" class="from-table font-line-space"> -->
<a-row type="flex">
<a-col :span="4" class="bg-gray">
diff --git a/src/views/evaluation/components/projectInfo.vue b/src/views/evaluation/components/projectInfo.vue
index 9f72195e5e75edd508ca9e34837ff6806c12d5bf..ca2fa78b8ca250145c3193f42fe498cc35131e41 100644
--- a/src/views/evaluation/components/projectInfo.vue
+++ b/src/views/evaluation/components/projectInfo.vue
@@ -467,17 +467,7 @@ export default {
},
},
created () {
- if (!!!this.tabsData || this.tabsData.length == 0)
- this.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: '5', isShow: true },
- { title: '项目审核记录', key: '6', isShow: true },
- ]
+
},
mounted () {
},
diff --git a/src/views/evaluation/components/projectView.vue b/src/views/evaluation/components/projectView.vue
index 533a78ad22c129b23a2d3d2ab59dca45272250f0..bb811992e7bb2f13f1fbf1e971ab95d1effda41c 100644
--- a/src/views/evaluation/components/projectView.vue
+++ b/src/views/evaluation/components/projectView.vue
@@ -3,10 +3,10 @@
<div class="app-content layoutEmbedded" style="height: 76vh;overflow: auto;">
<a-spin :spinning="loading" style="width: 100%;height: 100%;">
<div class="page-content">
- <a-tabs type="card" hideAdd size="small" @change="callback">
+ <!-- <a-tabs type="card" hideAdd size="small" @change="callback">
<a-tab-pane :key="item.key" :tab="item.title" v-for="(item) in tabsData">
</a-tab-pane>
- </a-tabs>
+ </a-tabs> -->
</div>
<div class="page-footer">
<!-- 申报项目详情 -->
diff --git a/src/views/evaluation/components/score.vue b/src/views/evaluation/components/score.vue
index 9374f3513a6e951bdbfc32aa0f8f6d4fb574bd53..46ff24d93a1eb2b57ab210963fcb963d4dd565d3 100644
--- a/src/views/evaluation/components/score.vue
+++ b/src/views/evaluation/components/score.vue
@@ -2,51 +2,55 @@
<div style="height:75vh;overflow:auto" class="app-content">
<a-spin :spinning="loading" style="width: 100%;height: 100%;">
<div v-if="isShow" style="width: 100%;height: 100%;">
- <a-tabs type="card" @change="callback" :activeKey='tabsActive'>
- <a-tab-pane key="1" tab="评分"></a-tab-pane>
- <a-tab-pane key="2" tab="指标说明" v-if="totalFunding > 50"></a-tab-pane>
- <a-tab-pane key="3" tab="项目信息"></a-tab-pane>
- </a-tabs>
- <div class="table-content">
+ <div style="height: 40px;">
+ <a-tabs type="card" @change="callback" :activeKey='tabsActive'>
+ <a-tab-pane key="1" tab="评分"></a-tab-pane>
+ <a-tab-pane key="2" tab="指标说明" v-if="totalFunding > 50"></a-tab-pane>
+ <a-tab-pane key="3" tab="项目信息"></a-tab-pane>
+ </a-tabs>
+ </div>
+ <div class="table-content" style="overflow: auto;height: calc(100% - 40px);">
<div v-show="tabsActive==='1'" style="height:100%;">
- <div style="height:calc(100% - 40px);overflow: auto;">
- <a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
- <economy v-model="formData" v-if="formData.expertType == 2"/>
- <div v-else>
- <technology-evalucation v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>
+ <div style="height:calc(100% - 40px);overflow: auto;" ref="main">
+ <div class="x_modal_content">
+ <a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
+ <economy v-model="formData" v-if="formData.expertType == 2" />
<div v-else>
- <a-row type="flex">
- <a-col :span="4" class="bg-gray">
- <div class="special-middle" style="text-align:center!important;">
- <div>评审意见 </div>
- </div>
- </a-col>
- <a-col :span="20">
- <div>
- <a-form-model-item prop="remark">
- <a-textarea placeholder="评审意见" v-model="formData.remark" :maxLength="1000" style="width: 80%; height: 120px; margin-top: 6px" />
+ <technology-evalucation v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>
+ <div v-else>
+ <a-row type="flex">
+ <a-col :span="4" class="bg-gray">
+ <div class="special-middle" style="text-align:center!important;">
+ <div>评审意见 </div>
+ </div>
+ </a-col>
+ <a-col :span="20">
+ <div>
+ <a-form-model-item prop="remark">
+ <a-textarea placeholder="评审意见" v-model="formData.remark" :maxLength="1000" style="width: 80%; height: 120px; margin-top: 6px" />
+ </a-form-model-item>
+ </div>
+ </a-col>
+ </a-row>
+ <a-row type="flex">
+ <a-col :span="4" class="bg-gray">
+ <div class="special-middle" style="text-align:center!important;">
+ <div>是否推荐立项支持 </div>
+ </div>
+ </a-col>
+ <a-col :span="20">
+ <a-form-model-item prop="supportState">
+ <a-radio-group v-model="formData.supportState">
+ <a-radio :value="1">是</a-radio>
+ <a-radio :value="0">否</a-radio>
+ </a-radio-group>
</a-form-model-item>
- </div>
- </a-col>
- </a-row>
- <a-row type="flex">
- <a-col :span="4" class="bg-gray">
- <div class="special-middle" style="text-align:center!important;">
- <div>是否推荐立项支持 </div>
- </div>
- </a-col>
- <a-col :span="20">
- <a-form-model-item prop="supportState">
- <a-radio-group v-model="formData.supportState">
- <a-radio :value="1">是</a-radio>
- <a-radio :value="0">否</a-radio>
- </a-radio-group>
- </a-form-model-item>
- </a-col>
- </a-row>
+ </a-col>
+ </a-row>
+ </div>
</div>
- </div>
- </a-form-model>
+ </a-form-model>
+ </div>
</div>
<div style="height:40px;width:100%;text-align:center;padding:4px 0px;background: #fafafa;border:1px solid #e8e8e8; border-width: 0px 1px 1px 1px;border-style: solid;border-color: #e8e8e8;">
<a-button @click="save" style="margin-right:16px">保存</a-button>
@@ -80,7 +84,8 @@
<span style="line-height:2;">（2）目标实现风险：评价项目目标实现是否存在风险。</span>
</div>
<div v-show="tabsActive==='3'" style="height:100%;overflow: auto;">
- <project-view v-model="formData.projId" />
+ <project-info v-model="projectInfo" :tabsData.sync="tabsData" />
+ <!-- <project-view v-model="formData.projId" /> -->
</div>
</div>
</div>
@@ -117,13 +122,14 @@ import { isEmptyParams } from "@/views/utils/common"
import { budgetList } from '@/views/report/project/config'
import moment from 'moment'
import projectView from '@/views/evaluation/components/projectView'
+import projectInfo from '@/views/evaluation/components/projectInfo'
import technologyEvalucation from '@/views/evaluation/components/technologyEvalucation'
import economy from '@/views/evaluation/components/economy'
export default {
name: "score",
components: {
- projectView, technologyEvalucation, economy
+ projectView, projectInfo, technologyEvalucation, economy
},
props: {
value: {
@@ -161,7 +167,7 @@ export default {
isProjectInfoLoad: false,
tabsActive: '1',
check: {
- time: 10, title: '我已阅读', count: 10, disabled: false,
+ time: 5, title: '我已阅读', count: 5, disabled: false,
},
formData: {
id: null, projId: null, expertId: null, expertName: null,
@@ -230,6 +236,16 @@ export default {
auditList: [],
},
comBatch: { expertStart: '', expertEnd: '' },
+ 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: '5', isShow: true },
+ { title: '项目审核记录', key: '6', isShow: true },
+ ],
};
},
created () {
@@ -325,6 +341,9 @@ export default {
callback (key) {
this.tabsActive = key
},
+ changeScroll () {
+ this.$refs.main.scrollTop = document.getElementsByClassName('x_modal_content')[0].offsetHeight
+ },
save () {
if (this.checkInfo()) {
this.loading = true
@@ -351,7 +370,6 @@ export default {
}
},
submit () {
- console.log(this.formData)
this.$refs.form.validate(valid => {
if (valid) {
this.loading = true
@@ -365,25 +383,32 @@ export default {
}
this.loading = false
}).catch(() => { this.loading = false })
- } else { this.tabsActive = '1' }
+ } else {
+ this.tabsActive = '1'
+ this.$message.error('评审信息未填写完全！')
+ this.changeScroll()
+ }
})
},
},
};
</script>
<style scoped lang="less">
+::v-deep .ant-spin-container {
+ width: 100%;
+ height: 100%;
+}
.app-content {
::v-deep.ant-spin-nested-loading .ant-spin-container {
height: 100%;
}
.table-content {
- height: calc(100% - 40px);
- border-width: 0px 1px 1px 1px;
+ border-width: 0px 1px 0px 1px;
border-style: solid;
- border: 1px solid #f0f0f0;
- padding: 6px 6px;
+ border-color: #f0f0f0;
+ // border: 0px 1px 1px 1px solid #f0f0f0;
+ padding: 4px 4px 0px 4px;
}
- padding: 0;
::v-deep.ant-tabs .ant-tabs-bar {
margin: 0 !important;
}
diff --git a/src/views/evaluation/query.vue b/src/views/evaluation/query.vue
index 652d71da3bfa9962d79fd3c566f29c32e09b3a64..9aa595fe35deaeb7b2efe69045aa44e58125d0a1 100644
--- a/src/views/evaluation/query.vue
+++ b/src/views/evaluation/query.vue
@@ -34,7 +34,6 @@
<a-modal v-model="visibleView" v-if="visibleView" title="项目详情" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
<project-view v-model="projectId" @close="() => this.visibleView = false" />
</a-modal>
- projId
</div>
</template>