Compare commits

..

No commits in common. 'fe9fc31bf6f8c5deb1797751b73b66dc952dd303' and 'c1ddfc9eb9d9b819791fc76ca4bd10c03d4573da' have entirely different histories.

@ -90,7 +90,6 @@
</el-col>--> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-if="$route.query.id"
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
@ -114,7 +113,6 @@
<!-- <el-table v-loading="loading" :data="vote_empList" @selection-change="handleSelectionChange">--> <!-- <el-table v-loading="loading" :data="vote_empList" @selection-change="handleSelectionChange">-->
<el-table border v-loading="loading" :data="vote_empList"> <el-table border v-loading="loading" :data="vote_empList">
<el-table-column label="评分任务" align="center" prop="pcName" />
<el-table-column label="评分主题" align="center" prop="voteTitle" /> <el-table-column label="评分主题" align="center" prop="voteTitle" />
<el-table-column label="被考核对象" align="center" prop="bkhdxName" /> <el-table-column label="被考核对象" align="center" prop="bkhdxName" />
<el-table-column label="评分人数" align="center" prop="voteNum" /> <el-table-column label="评分人数" align="center" prop="voteNum" />
@ -139,18 +137,7 @@
<el-table-column label="评分占比" align="center" prop="percentage" /> <el-table-column label="评分占比" align="center" prop="percentage" />
<el-table-column label="最终得分" align="center" prop="endScore" /> <el-table-column label="最终得分" align="center" prop="endScore" />
<el-table-column label="创建时间" align="center" prop="createTime"/> <el-table-column label="创建时间" align="center" prop="createTime"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="备注" align="center" prop="remark" />
<template slot-scope="scope">
<el-button
v-if="$route.query.id"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['kaohe:vote_emp:edit']"
>修改</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -163,31 +150,30 @@
<!-- 添加或修改投票选项对话框 --> <!-- 添加或修改投票选项对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false"> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="评分任务" prop="pcName"> <el-form-item label="投票id" prop="voteId">
<el-input v-model="form.pcName" placeholder="请输入评分任务" disabled/> <el-input v-model="form.voteId" placeholder="请输入投票id" />
</el-form-item> </el-form-item>
<el-form-item label="评分主题" prop="voteTitle"> <el-form-item label="评分主题" prop="voteTitle">
<el-input v-model="form.voteTitle" placeholder="请输入评分主题" disabled/> <el-input v-model="form.voteTitle" placeholder="请输入评分主题" />
</el-form-item>
<el-form-item label="职工id" prop="empId">
<el-input v-model="form.empId" placeholder="请输入职工id" />
</el-form-item> </el-form-item>
<el-form-item label="被考核对象" prop="bkhdxName"> <el-form-item label="被考核对象" prop="bkhdxName">
<el-input v-model="form.bkhdxName" placeholder="请输入被考核对象" disabled/> <el-input v-model="form.bkhdxName" placeholder="请输入被考核对象" />
</el-form-item>
<el-form-item label="选项内容">
<editor v-model="form.content" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item label="评分人数" prop="voteNum"> <el-form-item label="当前投票数" prop="voteNum">
<el-input-number v-model="form.voteNum" :min="0" label="请输入评分人数" :precision="0"></el-input-number> <el-input v-model="form.voteNum" placeholder="请输入当前投票数" />
</el-form-item> </el-form-item>
<el-form-item label="评分总分" prop="voteScore" v-if="form.khitemTypeid!==1"> <el-form-item label="当前投票分数" prop="voteScore">
<el-input-number v-model="form.voteScore" :min="0" label="请输入评分总分" :precision="2"></el-input-number> <el-input v-model="form.voteScore" placeholder="请输入当前投票分数" />
</el-form-item> </el-form-item>
<el-form-item label="评分选项" prop="voteScore" v-if="form.khitemTypeid===1"> <el-form-item label="备注" prop="remark">
<div style="display: flex;justify-content: space-between; margin-bottom: 5px;">优秀 <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input-number v-model="form.optionA" :min="0" label="请输入优秀数量" :precision="0"></el-input-number></div>
<div style="display: flex;justify-content: space-between; margin-bottom: 5px;">合格
<el-input-number v-model="form.optionB" :min="0" label="请输入合格数量" :precision="0"></el-input-number></div>
<div style="display: flex;justify-content: space-between; margin-bottom: 5px;">基本合格
<el-input-number v-model="form.optionC" :min="0" label="请输入基本合格数量" :precision="0"></el-input-number></div>
<div style="display: flex;justify-content: space-between">不合格
<el-input-number v-model="form.optionD" :min="0" label="请输入不合格数量" :precision="0"></el-input-number></div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

Loading…
Cancel
Save