Skip to content

Y
yn-science-front
Commit 3c6d80a7 authored by 徐俊's avatar 徐俊
Browse files
Options

Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

parents 08ffe7d2 a34fb073
Expand all Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 24 deletions
src/views/evaluation/components/config.js 0 → 100644
View file @ 3c6d80a7
This diff is collapsed.
src/views/evaluation/components/economy.vue 0 → 100644
View file @ 3c6d80a7
<template>
<div style="height:75vh;overflow:auto" class="app-content">
<table class="tab-content" style="width: 100%">
<tr>
<th>序号</th>
<th>内容</th>
<th>指标</th>
<th>评分内容</th>
<th>指标值</th>
<th>分值</th>
<th>评估评审标准</th>
<th>打分</th>
</tr>
<tr v-for="(item,index) in fromList" :key="'tr1'+index">
<td :rowspan="item.row1" v-if="item.row1>0"></td>
<td :rowspan="item.row1" v-if="item.row1>0">{{ item.title1 }}</td>
<td :rowspan="item.row2" v-if="item.row2>0">{{ item.title2 }}</td>
<td :rowspan="item.row3" v-if="item.row3>0">{{ item.title3 }}</td>
<td style="text-align: center;">{{ item.title }}</td>
<td style="text-align: center;">{{ item.score }}</td>
<td>{{ item.meaning }}</td>
<td style="text-align: center;" :rowspan="item.row3" v-if="item.row3>0">
<a-form-model-item :prop="'score' + item.order" v-if="item.order==1">
<a-input-number v-model="formData.score1" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==2">
<a-input-number v-model="formData.score2" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==3">
<a-input-number v-model="formData.score3" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==4">
<a-input-number v-model="formData.score4" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==5">
<a-input-number v-model="formData.score5" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==6">
<a-input-number v-model="formData.score6" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==7">
<a-input-number v-model="formData.score7" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==8">
<a-input-number v-model="formData.score8" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==9">
<a-input-number v-model="formData.score9" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==10">
<a-input-number v-model="formData.score10" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==11">
<a-input-number v-model="formData.score11" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==12">
<a-input-number v-model="formData.score12" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==13">
<a-input-number v-model="formData.score13" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==14">
<a-input-number v-model="formData.score14" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==15">
<a-input-number v-model="formData.score15" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==16">
<a-input-number v-model="formData.score16" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==17">
<a-input-number v-model="formData.score17" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==18">
<a-input-number v-model="formData.score18" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
<a-form-model-item :prop="'score' + item.order" v-if="item.order==19">
<a-input-number v-model="formData.score19" :min="0" :max="item.max" style="width: 60%" />
</a-form-model-item>
</td>
</tr>
</table>
</div>
</template>
<script>
import { standardList } from '@/views/evaluation/components/config'
export default {
name: "economy",
components: {},
props: {
value: {
type: Object,
default () {
return formData;
},
},
},
data () {
return {
fromList: standardList,
};
},
created () {
},
methods: {
},
};
</script>
<style scoped lang="less">
.app-content {
table {
table-layout: fixed;
width: 100%;
border: 1;
border-collapse: collapse;
}
table tr td,
th {
border: 1px solid #e8e8e8;
padding: 6px 6px;
color: rgba(0, 0, 0, 0.65);
}
table tr th {
text-align: center;
}
table tr {
th:first-child {
width: 4%;
}
th:nth-child(2) {
width: 6%;
}
th:nth-child(3) {
width: 8%;
}
th:nth-child(4) {
width: 18%;
}
th:nth-child(5) {
width: 6%;
}
th:nth-child(6) {
width: 6%;
}
th:nth-child(7) {
width: 40%;
}
}
table {
::v-deep .ant-row {
border: 0 !important;
}
::v-deep .ant-row .ant-col {
border: 0 !important;
min-height: 30px !important;
}
::v-deep .ant-form-item-control {
line-height: 30px !important;
}
::v-deep .ant-form-item {
margin: 0 !important;
}
::v-deep .ant-input-number {
height: 30px !important;
}
::v-deep .ant-input-number-input {
height: 30px !important;
}
}
}
</style>
ant-tabs
\ No newline at end of file
src/views/evaluation/components/score.vue
View file @ 3c6d80a7
......@@ -11,10 +11,11 @@
<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">
<technology-evalucation v-if="totalFunding > 50" v-model="formData"></technology-evalucation>
<technology-evalucation v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>
<economy v-if="totalFunding < 50" v-model="formData" />
<div v-else>
<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>
......@@ -99,7 +100,6 @@
<span style="line-height:2;">五、请严格遵守各项法律法规和评审纪律，评审工作做到实事求是、客观公正、科学规范、廉洁自律。</span><br />
<span style="line-height:2;">六、此次专家评审时间为：{{exportTime.expertStart + '至' + exportTime.expertEnd}}，请务必于{{exportTime.expertEnd}}前提交评审结果。</span><br />
<span style="line-height:2;">&nbsp; &nbsp; &nbsp; 再次感谢您对我们工作的大力支持，未尽事宜，另行通知。</span><br />
<!-- <span style="line-height:2;">&nbsp; &nbsp; &nbsp; 联系电话：{{ unitInfo.linkTel }}</span><br /> -->
<br />
</div>
<div style="height:40px;width:100%;text-align:center;padding:4px 0px;background: #fafafa;border:1px solid #e8e8e8; ">
......@@ -117,11 +117,12 @@ import { budgetList } from '@/views/report/project/config'
import moment from 'moment'
import projectView from '@/views/evaluation/components/projectView'
import technologyEvalucation from '@/views/evaluation/components/technologyEvalucation'
import economy from '@/views/evaluation/components/economy'
export default {
name: "score",
components: {
projectView, technologyEvalucation
projectView, technologyEvalucation, economy
},
props: {
value: {
......@@ -161,7 +162,8 @@ export default {
check: {
time: 10, title: '我已阅读', count: 10, disabled: false,
},
formData: { id: null, projId: null, expertId: null, expertName: null,
formData: {
id: null, projId: null, expertId: null, expertName: null,
score1: null, score2: null, score3: null, score4: null, score4: null, score5: null, score6: null, score7: null, score8: null, score9: null,
score10: null, score11: null, score12: null, score13: null, score14: null, score15: null, score16: null, score17: null,
totalScore: null, remark: null, supportState: null, projName: null, projNo: null, totalFunding: 0.00,
......@@ -184,6 +186,8 @@ export default {
score15: { required: true, message: "*", trigger: "blur" },
score16: { required: true, message: "*", trigger: "blur" },
score17: { required: true, message: "*", trigger: "blur" },
score18: { required: true, message: "*", trigger: "blur" },
score19: { required: true, message: "*", trigger: "blur" },
remark: [{ required: true, message: '请填写评审意见', trigger: 'blur' },],
supportState: { required: true, message: "请选择是否支持立项", trigger: "blur" },
evaluationType: { required: true, message: "*", trigger: "blur" },
......@@ -221,14 +225,12 @@ export default {
auditList: [],
},
comBatch: { expertStart: '', expertEnd: '' },
unitInfo: { linkTel: null },
};
},
created () {
this.getAssignExpertById()
this.getYear()
this.countStart()
// this.getCurrentUnitInfo()
},
methods: {
moment,
......@@ -254,13 +256,6 @@ export default {
}
}, 1000)
},
getCurrentUnitInfo() {
this.$api.unit.getCurrentUnitInfo().then(({ data = {} }) => {
if (data) {
this.unitInfo = data
}
}).catch(() => { })
},
loadExpertInfo () {
this.isShow = true
if (!this.isExpertInfoLoad)
......
src/views/evaluation/components/scoreEdit.vue deleted 100644 → 0
View file @ 08ffe7d2
This diff is collapsed.
src/views/query/project/Index.vue
View file @ 3c6d80a7
......@@ -21,7 +21,6 @@
<a-divider style="height: 1px; background-color: #e8e8e8;" />
<div class="submit-btn">
<a-button type="primary" @click="exportData" icon="download">Excel</a-button>
<!-- <a-button type="primary" @click="scoreClick" icon="download">评分</a-button> -->
</div>
<a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
<template slot="projName" slot-scope="record">
......@@ -40,9 +39,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="id" @close="closeWindow"></project-view>
</a-modal>
<a-modal v-model="visibleScore" v-if="visibleScore" title="评分" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
<score-edit />
</a-modal>
</div>
</template>
......@@ -51,7 +47,7 @@ import { getType } from '@/views/utils/auth'
import moment from 'moment'
import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
import projectView from '@/views/report/project/components/projectView'
import scoreEdit from '@/views/evaluation/components/scoreEdit'
export default {
name: 'queryProject',
components: {
......@@ -79,7 +75,6 @@ export default {
loading: false,
// 弹窗标志
visibleView: false,
visibleScore: false,
id: null,
loadState: false
}
......@@ -87,9 +82,6 @@ export default {
created () {
},
methods: {
scoreClick () {
this.visibleScore = true
},
search () {
this.pagination.pageIndex = 1
this.getListByPage()
......
src/views/report/project/config.js
View file @ 3c6d80a7
......@@ -324,6 +324,7 @@ const budgetList = () => {
}
]
}
const titleList = [{ title: '主任医师', key: '0caa997f-e1d9-4412-9589-acc8ff7f5fb8' },
{ title: '主任技师', key: 'bc904c24-d2a1-4393-b693-047bd4f958ce' },
{ title: '主任护师', key: '43073c81-f400-43e1-aecf-8b43012363ad' },
......@@ -381,7 +382,6 @@ const titleList = [{ title: '主任医师', key: '0caa997f-e1d9-4412-9589-acc8ff
{ title: '讲师', key: '1b5e0c69-335e-4d05-b285-e34ffd76b23c' },
{ title: '无职称', key: '24bf7a5b-78e8-425f-b3c2-a65d9c42b247' },]
const degreeList = [{ key: 'c6c21d5d-8c0b-4f6c-a8a7-c508673d1617', title: '博士后' },
{ key: 'f6c21d5d-8c0b-4f6c-a8a7-c508673d1615', title: '博士' },
{ key: 'fe111771-dac8-42c7-806a-4dd2ef73f3a8', title: '硕士' },
......
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