Quellcode durchsuchen

ehr-绩效:功能开发;

001295 vor 1 Jahr
Ursprung
Commit
62b2519c2a

+ 9 - 0
src/api/business/ehr/pm/stage.js

@@ -95,4 +95,13 @@ export function closeGradeAdjust(data) {
     method: 'post',
     data: data
   })
+}
+
+//过数到薪资
+export function cendToSalary(data) {
+  return request({
+    url: '/ehr/pm/stage/cendToSalary',
+    method: 'post',
+    data: data
+  })
 }

+ 3 - 2
src/views/business/ehr/pm/adjustGrade/index.vue

@@ -32,7 +32,7 @@
         <el-table-column label="上级评分" align="center" prop="ldMark" />
         <el-table-column label="调整分" align="center" prop="ajMark" />
         <el-table-column label="调整分等级" align="center" prop="ajGrade" />
-        <el-table-column label="调整等级" align="center" prop="grade" />
+        <el-table-column label="最终等级" align="center" prop="grade" />
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -63,9 +63,10 @@
         <el-descriptions-item label="上级评分">{{form.ldMark}}</el-descriptions-item>
         <el-descriptions-item label="调整分">{{form.ajMark}}</el-descriptions-item>
         <el-descriptions-item label="调整分等级">{{form.grade}}</el-descriptions-item>
+        <el-descriptions-item label="调整分原因">{{form.ajCause}}</el-descriptions-item>
       </el-descriptions>
       <el-form size="mini" label-position="right" ref="form" :model="form" :rules="formRules" label-width="80px">
-        <el-form-item label="等级" prop="grade">
+        <el-form-item label="最终等级" prop="grade">
           <el-select v-model="form.grade" >
             <el-option
               v-for="dict in ehr_pm_gradeconfig"

+ 19 - 4
src/views/business/ehr/pm/stagecontrol/detail.vue

@@ -9,9 +9,10 @@
           <el-button size="mini" type="primary" plain @click="btnFillinFinish" v-if="form.isPublish == 'Y' && form.stage == '0'">结束填写</el-button>
           <el-button size="mini" type="primary" plain @click="btnStartSelfEvaluation" v-if="form.stage == '2'">开始自评</el-button>
           <el-button size="mini" type="primary" plain @click="btnFinishSelfEvaluation" v-if="form.stage == '3'">结束自评</el-button>
-          <el-button size="mini" type="primary" plain @click="btnOpenGradeAdjust" v-if="form.stage == '5' && form.isAdjust == 'N'">开启等级调整</el-button>
-          <el-button size="mini" type="primary" plain @click="btnCloseGradeAdjust" v-if="form.stage == '5' && form.isAdjust == 'Y'">关闭等级调整</el-button>
-          <el-button size="mini" type="primary" plain @click="btnAdjustMark" v-if="form.stage == '5'">分数调整</el-button>
+          <el-button size="mini" type="primary" plain @click="btnOpenGradeAdjust" v-if="form.stage == '5' && form.isAdjust == 'N' && form.isSalary == 'N'">开启等级调整</el-button>
+          <el-button size="mini" type="primary" plain @click="btnCloseGradeAdjust" v-if="form.stage == '5' && form.isAdjust == 'Y' && form.isSalary == 'N'">关闭等级调整</el-button>
+          <el-button size="mini" type="primary" plain @click="btnAdjustMark" v-if="form.stage == '5' && form.isSalary == 'N'">分数调整</el-button>
+          <el-button size="mini" type="primary" plain @click="btnCendToSalary" v-if="form.stage == '5' && form.isSalary == 'N'">过数到薪资</el-button>
           <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
           <el-button size="mini" plain @click="btnNext">下一个</el-button>
         </div>
@@ -53,7 +54,7 @@
 </template>
 
 <script>
-import { getStage,addStage,updateStage,publishStage,fillinFinish,startSelfEvaluation,finishSelfEvaluation,openGradeAdjust,closeGradeAdjust} from "@/api/business/ehr/pm/stage";
+import { getStage,addStage,updateStage,publishStage,fillinFinish,startSelfEvaluation,finishSelfEvaluation,openGradeAdjust,closeGradeAdjust,cendToSalary} from "@/api/business/ehr/pm/stage";
 
 export default {
   name: 'detail',
@@ -223,6 +224,20 @@ export default {
     btnAdjustMark(){
       this.$router.push({ name: 'AdjustMark', params: { id: this.id } });
     },
+    //过数到薪资
+    btnCendToSalary(){
+      this.$confirm('确认要同步到薪资绩效系数吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        cendToSalary(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("操作成功");
+        });
+      }).catch(() => {      
+      });
+    },
     //修改
     btnEdit(){
       this.pageState = "edit";

+ 0 - 3
src/views/business/ehr/pm/verify/index.vue

@@ -88,9 +88,6 @@ export default {
     };
   },
   created() {
-    console.log("this.$route.query.code",this.$route.query.code);
-    console.log("this.$route.query.performanceId",this.$route.query.performanceId);
-    console.log("this.$route.query.flowId",this.$route.query.flowId);
     this.fetchPerformance(this.$route.query.performanceId);
     this.fetchFlow(this.$route.query.flowId);
   },