Commit 232fd6fe authored by 徐俊's avatar 徐俊

xujun

parent 6b39d72e
......@@ -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()
......
......@@ -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()
},
......
......@@ -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 () {
},
......
......@@ -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 () {
},
......
......@@ -56,9 +56,9 @@
<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>
......@@ -172,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'
......@@ -303,6 +303,17 @@ export default {
],
};
},
computed: {
evaluationTypeA () {
return getEvaluationType(0)
},
evaluationTypeB () {
return getEvaluationType(1)
},
evaluationTypeC () {
return getEvaluationType(2)
},
},
created () {
this.getAssignExpertById()
this.getYear()
......
......@@ -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()
},
......
......@@ -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
......
......@@ -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
......
......@@ -482,3 +482,8 @@ 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
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