Merge remote-tracking branch 'origin/master'

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

@@ -231,8 +231,10 @@ export default {
         ) : (
           <p>{content ? content : "--"}</p>
         )
-      ) : (
+      ) : val ? (
         val
+      ) : (
+        "--"
       );
     },
 

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
-      <el-button slot="table-head-left2" style="margin-left: 10px" icon="el-icon-tickets" size="mini" @click="doExport"
-        :disabled="isExport">导出</el-button>
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        icon="el-icon-tickets"
+        size="mini"
+        @click="doExport"
+        :disabled="isExport"
+        >导出</el-button
+      >
     </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
@@ -19,7 +26,7 @@ export default {
     dialogShow,
   },
   mixins: [table],
-  created() { },
+  created() {},
   methods: {
     /** 导出Excel */
     doExport() {
@@ -82,13 +89,13 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "工号", prop: "workNum" },
+          { label: "工号", prop: "workNum", formatter: this.formatter },
 
-          { label: "手机号", prop: "phoneNumber" },
+          { label: "手机号", prop: "phoneNumber", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
           {
             label: "所属中心",
             formatter: (row) => {
@@ -96,16 +103,34 @@ export default {
             },
           },
 
-          { label: "考勤绩效指标分数", prop: "attendScore",  },
+          {
+            label: "考勤绩效指标分数",
+            prop: "attendScore",
+          },
 
-          { label: "评价绩效指标分数", prop: "reviewScore", },
-          { label: "投诉绩效指标分数", prop: "complainScore", },
+          {
+            label: "评价绩效指标分数",
+            prop: "reviewScore",
+          },
+          {
+            label: "投诉绩效指标分数",
+            prop: "complainScore",
+          },
 
-          { label: "办件绩效分数", prop: "goworkScore",  },
+          {
+            label: "办件绩效分数",
+            prop: "goworkScore",
+          },
 
-          { label: "效能绩效分数", prop: "effectScore", },
+          {
+            label: "效能绩效分数",
+            prop: "effectScore",
+          },
 
-          { label: "其它绩效分数", prop: "otherScore", },
+          {
+            label: "其它绩效分数",
+            prop: "otherScore",
+          },
 
           {
             label: "累计异常分数",