Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -192,7 +192,7 @@ export default {
       return new Date(year, month, day);
     },
     formatteSec(row, column, val) {
-      return val ? (val / 60 / 60 / 24).toFixed(3) + "天" : "--";
+      return val ? (val / 60 / 60 / 24).toFixed(2) + "天" : "--";
     },
     // 格式化单元格数据
     formatter(row, column, val) {

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

@@ -96,27 +96,25 @@ export default {
             },
           },
 
-          { label: "考勤绩效指标分数", prop: "attendScore", formatter: this.formatter },
+          { label: "考勤绩效指标分数", prop: "attendScore",  },
 
-          { label: "评价绩效指标分数", prop: "reviewScore", formatter: this.formatter },
-          { label: "投诉绩效指标分数", prop: "reviewScore", formatter: this.formatter },
+          { label: "评价绩效指标分数", prop: "reviewScore", },
+          { label: "投诉绩效指标分数", prop: "complainScore", },
 
-          { label: "办件绩效分数", prop: "workScore", formatter: this.formatter },
+          { label: "办件绩效分数", prop: "goworkScore",  },
 
-          { label: "效能绩效分数", prop: "effectScore", formatter: this.formatter },
+          { label: "效能绩效分数", prop: "effectScore", },
 
-          { label: "其它绩效分数", prop: "otherScore", formatter: this.formatter },
+          { label: "其它绩效分数", prop: "otherScore", },
 
           {
             label: "累计异常分数",
             prop: "errorScore",
-            formatter: this.formatter,
           },
 
           {
             label: "本月得分数",
             prop: "totalScore",
-            formatter: this.formatter,
           },
           { label: "年", prop: "year", formatter: this.formatter },
           { label: "月", prop: "month", formatter: this.formatter },