Переглянути джерело

EHR-绩效:增加看板功能

001295 1 рік тому
батько
коміт
e924e35b52

+ 7 - 1
src/views/business/ehr/pm/mark/detail.vue

@@ -16,7 +16,7 @@
             <el-descriptions-item label="员工姓名">{{form.staffName}}</el-descriptions-item>
             <el-descriptions-item label="入职日期">{{form.dateJoin}}</el-descriptions-item>
             <el-descriptions-item label="转正日期">{{form.probationComplete}}</el-descriptions-item>
-            <el-descriptions-item label="部门">{{form.deptName}}</el-descriptions-item>
+            <el-descriptions-item label="部门" span="2">{{form.deptName}}</el-descriptions-item>
             <el-descriptions-item label="职位">{{form.jobName}}</el-descriptions-item>
             <el-descriptions-item label="评估周期">{{form.name}}</el-descriptions-item>
             <el-descriptions-item label="评估人">{{form.evaluatorName}}</el-descriptions-item>
@@ -26,6 +26,9 @@
               </div>
             </el-descriptions-item>
           </el-descriptions>
+          <el-descriptions :column="6 ">
+            <el-descriptions-item label="自评分" v-if="form.status > 3">{{form.saMark}}</el-descriptions-item>
+          </el-descriptions>
           <el-descriptions v-if="form.status > 3">
             <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
           </el-descriptions>
@@ -199,6 +202,7 @@ export default {
         if (valid) {
           //保存绩效数据
           savePerformance(this.form);
+          this.loading = true;
           this.turnDownOpen = false;
           this.flow.status = 1;
           //保存流程数据
@@ -208,6 +212,7 @@ export default {
               this.fetchFlow(this.$route.query.flowId);
               this.$modal.msgSuccess("已确认");
             }
+            this.loading = false;
           })
         }
       });
@@ -218,6 +223,7 @@ export default {
         if (valid) {
           //保存绩效数据
           savePerformance(this.form);
+          this.loading = true;
           this.flow.status = 2;
           this.flow.result = "已评分";
           //保存流程数据

+ 1 - 1
src/views/business/ehr/pm/performance/index.vue

@@ -75,7 +75,7 @@
         <el-button type="primary" size="mini" @click="btnNextMonth">下月绩效</el-button>
       </div>
       <el-table size="mini" height="500px" v-loading="loading" :data="listData" @row-dblclick="btnDetails">
-        <el-table-column label="编号" align="center" prop="id" />
+        <el-table-column label="绩效编号" align="center" prop="id" />
         <el-table-column label="员工姓名" align="center" prop="staffName" />
         <el-table-column show-overflow-tooltip label="评估周期" align="center" prop="name" />
         <el-table-column label="月度" align="center" prop="month" />

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

@@ -239,10 +239,10 @@ export default {
         that.loading = false;
       });
     },
-    //开启等级调整
+    //开启分数调整
     btnOpenGradeAdjust(){
       let that = this;
-      this.$modal.confirm('确认要开启等级调整?').then(async function() {
+      this.$modal.confirm('确认要开启分数调整?').then(async function() {
         that.loading = true;
         return await openGradeAdjust(that.form);
       }).then(() => {
@@ -253,10 +253,10 @@ export default {
         that.loading = false;
       });
     },
-    //关闭等级调整
+    //关闭分数调整
     btnCloseGradeAdjust(){
       let that = this;
-      this.$modal.confirm('确认要关闭等级调整?').then(async function() {
+      this.$modal.confirm('确认要关闭分数调整?').then(async function() {
         that.loading = true;
         return await closeGradeAdjust(that.form);
       }).then(() => {

+ 1 - 1
src/views/business/ehr/pm/stagecontrol/index.vue

@@ -18,7 +18,7 @@
         <el-button type="primary" size="mini" @click="btnAdd">新增</el-button>
       </div>
       <el-table size="mini" v-loading="loading" :data="listData" height="500px" @row-dblclick="btnDetails">
-        <el-table-column label="编号" align="center" prop="id" />
+        <el-table-column label="周期编号" align="center" prop="id" />
         <el-table-column label="名称" align="center" prop="name" />
         <el-table-column label="月份" align="center" prop="month" />
         <el-table-column label="阶段" align="center" prop="stage" >

+ 1 - 1
src/views/business/ehr/pm/verify/detail.vue

@@ -15,7 +15,7 @@
           <el-descriptions-item label="员工姓名">{{form.staffName}}</el-descriptions-item>
           <el-descriptions-item label="入职日期">{{form.dateJoin}}</el-descriptions-item>
           <el-descriptions-item label="转正日期">{{form.probationComplete}}</el-descriptions-item>
-          <el-descriptions-item label="部门">{{form.deptName}}</el-descriptions-item>
+          <el-descriptions-item label="部门" span="2">{{form.deptName}}</el-descriptions-item>
           <el-descriptions-item label="职位">{{form.jobName}}</el-descriptions-item>
           <el-descriptions-item label="评估周期">{{form.name}}</el-descriptions-item>
           <el-descriptions-item label="评估人">{{form.evaluatorName}}</el-descriptions-item>

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

@@ -110,7 +110,6 @@ export default {
     },
     //调整分数
     async btnPmVerify(row){
-      console.log('row',row);
       this.$router.push({ name: 'PmVerifyDetail', query: { performanceId: row.id,flowId: row.flowId } });
     },
     //返回