Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/views/kaohe/vote_emp/index.vue

@@ -90,6 +90,7 @@
       </el-col>-->
       <el-col :span="1.5">
         <el-button
+          v-if="$route.query.id"
           type="warning"
           plain
           icon="el-icon-download"
@@ -113,6 +114,7 @@
 
 <!--    <el-table v-loading="loading" :data="vote_empList" @selection-change="handleSelectionChange">-->
     <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="bkhdxName" />
       <el-table-column label="评分人数" align="center" prop="voteNum" />
@@ -137,7 +139,18 @@
       <el-table-column label="评分占比" align="center" prop="percentage" />
       <el-table-column label="最终得分" align="center" prop="endScore" />
       <el-table-column label="创建时间" align="center" prop="createTime"/>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <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>
 
     <pagination
@@ -150,30 +163,31 @@
 
     <!-- 添加或修改投票选项对话框 -->
     <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="80px">
-        <el-form-item label="投票id" prop="voteId">
-          <el-input v-model="form.voteId" placeholder="请输入投票id" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-form-item label="评分任务" prop="pcName">
+          <el-input v-model="form.pcName" placeholder="请输入评分任务" disabled/>
         </el-form-item>
         <el-form-item label="评分主题" prop="voteTitle">
-          <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-input v-model="form.voteTitle" placeholder="请输入评分主题" disabled/>
         </el-form-item>
         <el-form-item label="被考核对象" prop="bkhdxName">
-          <el-input v-model="form.bkhdxName" placeholder="请输入被考核对象" />
-        </el-form-item>
-        <el-form-item label="选项内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.bkhdxName" placeholder="请输入被考核对象" disabled/>
         </el-form-item>
-        <el-form-item label="当前投票数" prop="voteNum">
-          <el-input v-model="form.voteNum" placeholder="请输入当前投票数" />
+        <el-form-item label="评分人数" prop="voteNum">
+          <el-input-number v-model="form.voteNum" :min="0" label="请输入评分人数" :precision="0"></el-input-number>
         </el-form-item>
-        <el-form-item label="当前投票分数" prop="voteScore">
-          <el-input v-model="form.voteScore" placeholder="请输入当前投票分数" />
+        <el-form-item label="评分总分" prop="voteScore" v-if="form.khitemTypeid!==1">
+          <el-input-number v-model="form.voteScore" :min="0" label="请输入评分总分" :precision="2"></el-input-number>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="评分选项" prop="voteScore" v-if="form.khitemTypeid===1">
+          <div style="display: flex;justify-content: space-between; margin-bottom: 5px;">优秀
+            <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>
       <div slot="footer" class="dialog-footer">