diff --git a/src/views/assign/components/projectAssignDetail.vue b/src/views/assign/components/projectAssignDetail.vue
index 3f659dc4d5d9e77b6dce6b87167e4fa6a5c73d2d..1ac38e0de3aea54d48e9162187e4b69cc9f589eb 100644
--- a/src/views/assign/components/projectAssignDetail.vue
+++ b/src/views/assign/components/projectAssignDetail.vue
@@ -32,9 +32,9 @@
<span v-for="data in record.specList" :key="data.id" :color="'green'">{{data.specName+' '}}</span>
</template>
<template slot="evaluationType" slot-scope="record">
- <a-tag :color="'#87d068'" v-if="record.evaluationType==1">A类(通过)</a-tag>
- <a-tag :color="'#2db7f5'" v-if="record.evaluationType==2">B类(建议修改)</a-tag>
- <a-tag :color="'#f50'" v-if="record.evaluationType==3">C类(不通过)</a-tag>
+ <a-tag :color="'#87d068'" v-if="record.evaluationType==1">{{ evaluationTypeA }}</a-tag>
+ <a-tag :color="'#2db7f5'" v-if="record.evaluationType==2">{{ evaluationTypeB }}</a-tag>
+ <a-tag :color="'#f50'" v-if="record.evaluationType==3">{{ evaluationTypeC }}</a-tag>
</template>
<!-- <template slot="expertEvaluation" slot-scope="record">
<a-tag :color="evaluationColor(record)">{{evaluationText(record)}}</a-tag>
@@ -57,7 +57,7 @@
import moment from 'moment'
import { getType } from '@/views/utils/auth'
import scoreView from '@/views/evaluation/components/scoreView'
-import { isEmptyParams } from '@/views/utils/common'
+import { isEmptyParams, getEvaluationType } from '@/views/utils/common'
export default {
name: 'projectAssignDetail',
@@ -95,6 +95,17 @@ export default {
}
}
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created () {
this.searchForm.projId = this.value
this.getListByPage()
diff --git a/src/views/audit/project/final.vue b/src/views/audit/project/final.vue
index 26f0bd277c8639de5822e919ed8d081f50acbaf0..c35d0f415cdfde7e162eea4dd2d9c9d3607507aa 100644
--- a/src/views/audit/project/final.vue
+++ b/src/views/audit/project/final.vue
@@ -57,9 +57,9 @@
<a-tag :color="obj.expertType==1?'#2db7f5':'#87d068'">{{obj.personName}}</a-tag>
</template>
<template slot="evaluationType" slot-scope="obj">
- <a-tag :color="'#87d068'" v-if="obj.evaluationType==1">A类(通过)</a-tag>
- <a-tag :color="'#2db7f5'" v-if="obj.evaluationType==2">B类(建议修改)</a-tag>
- <a-tag :color="'#f50'" v-if="obj.evaluationType==3">C类(不通过)</a-tag>
+ <a-tag :color="'#87d068'" v-if="obj.evaluationType==1">{{ evaluationTypeA }}</a-tag>
+ <a-tag :color="'#2db7f5'" v-if="obj.evaluationType==2">{{ evaluationTypeB }}</a-tag>
+ <a-tag :color="'#f50'" v-if="obj.evaluationType==3">{{ evaluationTypeC }}</a-tag>
</template>
<template slot="option" slot-scope="obj">
<a-button type="link" size="small" @click="recordClick(obj,'eView')">查看</a-button>
@@ -89,7 +89,7 @@
<script>
import { getType } from '@/views/utils/auth'
import moment from 'moment'
-import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
+import { isEmptyParams, filterExportExcelData, tableColumnsName, getEvaluationType } from "@/views/utils/common";
import projectAssignDetail from '@/views/assign/components/projectAssignDetail'
import paraSelect from '@/views/components/common/paraSelect'
import audit from '@/views/audit/project/audit'
@@ -185,6 +185,17 @@ export default {
objectId: null,
};
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created () {
this.getYear()
},
diff --git a/src/views/evaluation/components/economyEdit.vue b/src/views/evaluation/components/economyEdit.vue
index 9aa07293cc482c4b1caf2b4d4481c758ef7a7305..a62bf40811358588f0f316d5c267975b1653c0eb 100644
--- a/src/views/evaluation/components/economyEdit.vue
+++ b/src/views/evaluation/components/economyEdit.vue
@@ -157,9 +157,9 @@
<td colspan="4">
<a-form-model-item prop="evaluationType">
<a-radio-group v-model="value.evaluationType" disabled>
- <a-radio :value="1">A类(通过)</a-radio>
- <a-radio :value="2">B类(建议修改)</a-radio>
- <a-radio :value="3">C类(不通过)</a-radio>
+ <a-radio :value="1">{{ evaluationTypeA }}</a-radio>
+ <a-radio :value="2">{{ evaluationTypeB }}</a-radio>
+ <a-radio :value="3">{{ evaluationTypeC }}</a-radio>
</a-radio-group>
</a-form-model-item>
</td>
@@ -171,6 +171,7 @@
<script>
import { standardList } from '@/views/evaluation/components/config'
+import { getEvaluationType } from "@/views/utils/common"
export default {
name: "economy",
components: {},
@@ -239,6 +240,17 @@ export default {
},
};
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created () {
},
diff --git a/src/views/evaluation/components/economyInfo.vue b/src/views/evaluation/components/economyInfo.vue
index a7645954a8d39f9f29782457d06a169aa4045782..9f0763df5d06401bcb362b82785353f9b8a740f0 100644
--- a/src/views/evaluation/components/economyInfo.vue
+++ b/src/views/evaluation/components/economyInfo.vue
@@ -76,9 +76,9 @@
<tr>
<td colspan="4" class="bg-title" style="text-align: right;">评审结果</td>
<td colspan="4">
- <a-tag :color="'#87d068'" v-if="value.evaluationType==1">A类(通过)</a-tag>
- <a-tag :color="'#2db7f5'" v-if="value.evaluationType==2">B类(建议修改)</a-tag>
- <a-tag :color="'#f50'" v-if="value.evaluationType==3">C类(不通过)</a-tag>
+ <a-tag :color="'#87d068'" v-if="value.evaluationType==1">{{ evaluationTypeA }}</a-tag>
+ <a-tag :color="'#2db7f5'" v-if="value.evaluationType==2">{{ evaluationTypeB }}</a-tag>
+ <a-tag :color="'#f50'" v-if="value.evaluationType==3">{{ evaluationTypeC }}</a-tag>
</td>
</tr>
</table>
@@ -87,7 +87,7 @@
</template>
<script>
-import { toTextarea } from '@/views/utils/common'
+import { toTextarea, getEvaluationType } from '@/views/utils/common'
import { standardList } from '@/views/evaluation/components/config'
export default {
name: "economy",
@@ -157,6 +157,17 @@ export default {
},
};
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created () {
},
diff --git a/src/views/evaluation/components/score.vue b/src/views/evaluation/components/score.vue
index 07f3651de3cb42bf2c9f676cd10735c588b86ecf..0815e4ce2584b30b9a94d8c6a690c382c4bc0072 100644
--- a/src/views/evaluation/components/score.vue
+++ b/src/views/evaluation/components/score.vue
@@ -16,8 +16,8 @@
<a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
<economy-edit v-model="formData" v-if="formData.expertType == 2" />
<div v-else>
- <technology-evalucation v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>
- <div v-else>
+ <technology-evalucation 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;">
@@ -32,7 +32,7 @@
</div>
</a-col>
</a-row>
- <!-- <a-row type="flex">
+ <a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle" style="text-align:center!important;">
<div>是否推荐立项支持 </div>
@@ -46,7 +46,7 @@
</a-radio-group>
</a-form-model-item>
</a-col>
- </a-row> -->
+ </a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle" style="text-align:center!important;">
@@ -56,14 +56,14 @@
<a-col :span="20">
<a-form-model-item prop="evaluationType">
<a-radio-group v-model="formData.evaluationType">
- <a-radio :value="1">A类(通过)</a-radio>
- <a-radio :value="2">B类(建议修改)</a-radio>
- <a-radio :value="3">C类(不通过)</a-radio>
+ <a-radio :value="1">{{ evaluationTypeA }}</a-radio>
+ <a-radio :value="2">{{ evaluationTypeB }}</a-radio>
+ <a-radio :value="3">{{ evaluationTypeC }}</a-radio>
</a-radio-group>
</a-form-model-item>
</a-col>
</a-row>
- </div>
+ </div> -->
</div>
</a-form-model>
</div>
@@ -162,6 +162,7 @@
</div>
</div>
<div style="height:40px;width:100%;text-align:center;padding:4px 0px;background: #fafafa;border:1px solid #e8e8e8; ">
+ <a-checkbox @change="onReadChange">我已阅读</a-checkbox>
<a-button type="primary" @click="loadExpertInfo" :disabled="check.disabled">{{check.title}}</a-button>
</div>
</div>
@@ -171,7 +172,7 @@
<script>
import { getType } from '@/views/utils/auth'
-import { isEmptyParams } from "@/views/utils/common"
+import { isEmptyParams, getEvaluationType } from "@/views/utils/common"
import { budgetList } from '@/views/report/project/config'
import moment from 'moment'
import projectView from '@/views/evaluation/components/projectView'
@@ -302,6 +303,17 @@ export default {
],
};
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created () {
this.getAssignExpertById()
this.getYear()
@@ -318,18 +330,13 @@ export default {
},
countStart () {
this.check.disabled = true
- this.check.title = '阅读中...(' + this.check.count + 's)'
- let time = setInterval(() => {
- if (this.check.count == 1) {
- clearInterval(time)
- this.check.title = '我已阅读'
- this.check.count = this.check.time
- this.check.disabled = false
- } else {
- this.check.count--
- this.check.title = '阅读中...(' + this.check.count + 's)'
- }
- }, 1000)
+ this.check.title = '下一步'
+ },
+ onReadChange (e) {
+ if (e.target.checked)
+ this.check.disabled = false
+ else
+ this.check,disabled = true
},
loadExpertInfo () {
this.isShow = true
diff --git a/src/views/evaluation/components/scoreView.vue b/src/views/evaluation/components/scoreView.vue
index 9b24ce628a45a4bd7d07594d77560b1a2df8f7d7..841e26065f918332b7f14fe1527cd530b89469ce 100644
--- a/src/views/evaluation/components/scoreView.vue
+++ b/src/views/evaluation/components/scoreView.vue
@@ -26,9 +26,9 @@
<a-col :span="20">
<div class="special-middle">
<div>
- <a-tag :color="'#87d068'" v-if="formData.evaluationType==1">A类(通过)</a-tag>
- <a-tag :color="'#2db7f5'" v-if="formData.evaluationType==2">B类(建议修改)</a-tag>
- <a-tag :color="'#f50'" v-if="formData.evaluationType==3">C类(不通过)</a-tag>
+ <a-tag :color="'#87d068'" v-if="formData.evaluationType==1">{{ evaluationTypeA }}</a-tag>
+ <a-tag :color="'#2db7f5'" v-if="formData.evaluationType==2">{{ evaluationTypeB }}</a-tag>
+ <a-tag :color="'#f50'" v-if="formData.evaluationType==3">{{ evaluationTypeC }}</a-tag>
</div>
</div>
</a-col>
@@ -42,7 +42,7 @@
<script>
import economyInfo from '@/views/evaluation/components/economyInfo'
import technologyInfo from '@/views/evaluation/components/technologyInfo'
-import { toTextarea } from '@/views/utils/common'
+import { toTextarea, getEvaluationType } from '@/views/utils/common'
export default {
name: "scoreView",
components: {
@@ -62,6 +62,17 @@ export default {
loading: false,
};
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created () {
this.getAssignExpertById()
},
diff --git a/src/views/evaluation/components/technologyEvalucation.vue b/src/views/evaluation/components/technologyEvalucation.vue
index fdff9c2d6e3dd05b5109d0246f03607ed68e2c63..10ba8c960852e2b191df366520a21d086c00c34c 100644
--- a/src/views/evaluation/components/technologyEvalucation.vue
+++ b/src/views/evaluation/components/technologyEvalucation.vue
@@ -32,7 +32,7 @@
</tr>
<tr>
<td class="bg-title">是否推荐立项支持</td>
- <td colspan="2">
+ <td>
<a-form-model-item prop="supportState">
<a-radio-group v-model="supportState" @change="supportStateChange">
<a-radio :value="1">是</a-radio>
@@ -41,12 +41,12 @@
</a-form-model-item>
</td>
<td class="bg-title">评审结果</td>
- <td colspan="2">
+ <td colspan="3">
<a-form-model-item prop="evaluationType">
<a-radio-group v-model="evaluationType" @change="EcaluationChange" disabled>
- <a-radio :value="1">A类(通过)</a-radio>
- <a-radio :value="2">B类(修改)</a-radio>
- <a-radio :value="3">C类(不通过)</a-radio>
+ <a-radio :value="1">{{ evaluationTypeA }}</a-radio>
+ <a-radio :value="2">{{ evaluationTypeB }}</a-radio>
+ <a-radio :value="3">{{ evaluationTypeC }}</a-radio>
</a-radio-group>
</a-form-model-item>
</td>
@@ -56,6 +56,8 @@
</template>
<script>
+import { getEvaluationType } from "@/views/utils/common"
+
const formData = {
id: null,
projId: null,
@@ -133,6 +135,17 @@ export default {
disabled: true,
};
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created() {
this.tableData[0].grade = this.value.score1
this.tableData[1].grade = this.value.score2
diff --git a/src/views/evaluation/components/technologyInfo.vue b/src/views/evaluation/components/technologyInfo.vue
index db23f94cd85b7942e5a689ad1e16c5a97550ad4c..ed0e76ee0520d88ff417a303506274e15469a859 100644
--- a/src/views/evaluation/components/technologyInfo.vue
+++ b/src/views/evaluation/components/technologyInfo.vue
@@ -38,9 +38,9 @@
<td colspan="2">
<a-form-model-item prop="evaluationType">
<a-radio-group v-model="evaluationType" @change="EcaluationChange" disabled>
- <a-radio :value="1">A类(通过)</a-radio>
- <a-radio :value="2">B类(修改)</a-radio>
- <a-radio :value="3">C类(不通过)</a-radio>
+ <a-radio :value="1">{{ evaluationTypeA }}</a-radio>
+ <a-radio :value="2">{{ evaluationTypeB }}</a-radio>
+ <a-radio :value="3">{{ evaluationTypeC }}</a-radio>
</a-radio-group>
</a-form-model-item>
</td>
@@ -50,6 +50,8 @@
</template>
<script>
+import { getEvaluationType } from '@/views/utils/common'
+
const formData = {
id: null,
projId: null,
@@ -127,6 +129,17 @@ export default {
disabled: true,
};
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created() {
this.tableData[0].grade = this.value.score1
this.tableData[1].grade = this.value.score2
diff --git a/src/views/evaluation/index.vue b/src/views/evaluation/index.vue
index 2e9b9ad83285fac0fc6feac48fa24d5821a705ec..472804992139636d0d666d35684bab8b9c708e25 100644
--- a/src/views/evaluation/index.vue
+++ b/src/views/evaluation/index.vue
@@ -33,6 +33,14 @@
<a-button type="link" size="small" v-if="!!record.auditState && record.auditState == 2" @click="recordClick(record,'eView')">查看</a-button>
<a-button type="link" size="small" v-if="isButten" @click="recordClick(record,'eva')">评分</a-button>
</template>
+ <template slot="evaluationType" slot-scope="record">
+ <a-tag :color="'#87d068'" v-if="record.evaluationType==1">{{ evaluationTypeA }}</a-tag>
+ <a-tag :color="'#2db7f5'" v-if="record.evaluationType==2">{{ evaluationTypeB }}</a-tag>
+ <a-tag :color="'#f50'" v-if="record.evaluationType==3">{{ evaluationTypeC }}</a-tag>
+ </template>
+ <template slot="supportState" slot-scope="record">
+ {{ record.supportState == 1 ? "是" : "否" }}
+ </template>
</a-table>
<a-pagination v-if="pagination.total > 0" :total="pagination.total" show-size-changer show-quick-jumper v-model="pagination.pageIndex" :page-size="pagination.pageSize" :page-size-options="pagination.pageSizeOptions" @showSizeChange="showSizeChange" @change="change" :showTotal="() => `共 ${pagination.total} 条`" />
<a-modal v-model="visibleEvaluationView" title="专家评分" width="90%" :dialog-style="{ top: '5%' }" :footer="null" destroyOnClose>
@@ -55,7 +63,7 @@
<script>
import { getType } from '@/views/utils/auth'
import moment from 'moment'
-import { isEmptyParams, filterExportExcelData, tableColumnsName } from '@/views/utils/common'
+import { isEmptyParams, filterExportExcelData, tableColumnsName, getEvaluationType } from '@/views/utils/common'
import assignExpertView from '@/views/assign/components/assignExpertView'
import evaluationEdit from '@/views/evaluation/components/evaluationEdit'
import score from '@/views/evaluation/components/score'
@@ -78,6 +86,8 @@ export default {
{ title: "项目名称", scopedSlots: { customRender: 'projectName', colName: 'projName' }, align: 'left' },
{ title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center', width: 80 },
{ title: '评分', dataIndex: 'totalScore', align: 'center' },
+ { title: '评审结果', scopedSlots: { customRender: 'evaluationType' }, align: 'center' },
+ { title: '是否推荐立项支持', scopedSlots: { customRender: 'supportState' }, align: 'center' },
{ title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
{ title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
],
@@ -104,6 +114,17 @@ export default {
totalFunding: 0.00,
}
},
+ computed: {
+ evaluationTypeA () {
+ return getEvaluationType(0)
+ },
+ evaluationTypeB () {
+ return getEvaluationType(1)
+ },
+ evaluationTypeC () {
+ return getEvaluationType(2)
+ },
+ },
created () {
this.getYear()
},
@@ -213,7 +234,15 @@ export default {
},
previewFile () {
this.visibleStandard = true
- }
+ },
+ DetermineType(totalScore) {
+ if (totalScore >= 80)
+ this.evaluationType = 1
+ else if (totalScore < 80 && totalScore >= 60)
+ this.evaluationType = 2
+ else
+ this.evaluationType = 3
+ },
}
};
</script>
\ No newline at end of file
diff --git a/src/views/utils/common.js b/src/views/utils/common.js
index 1735d4dd12abb2609109628cb79b67d17653292c..a397bd5966bca9502d1b1a9d5e4b387404335869 100644
--- a/src/views/utils/common.js
+++ b/src/views/utils/common.js
@@ -481,4 +481,9 @@ export function mergeRow (key, data) {
}
}
return tableData
+}
+
+export function getEvaluationType (key) {
+ let evaluationName = ['A类(80分及以上)', 'B类(60分及以上)', 'C类(60分以下)']
+ return evaluationName[key]
}
\ No newline at end of file