Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue

@@ -17,7 +17,7 @@
         <el-row style="width: 100%;margin-bottom: 10px;">
           <el-form-item label="选择部门">
             <el-col :span="23">
-              <el-select v-model="form.deptId" style="width: 100%;">
+              <el-select v-model="form.deptId" filterable style="width: 100%;">
                 <el-option
                   v-for="item in deptArr"
                   :key="item.id"
@@ -361,7 +361,7 @@ export default {
 
           { label: "评分标准", prop: "content" },
 
-          { label: "分值", prop: "score" },
+          { label: "分值", prop: "score", formatter: this.formatter },
 
           {
             label: "操作",

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue

@@ -400,7 +400,7 @@ export default {
 
           { label: "评分标准", prop: "content" },
 
-          { label: "分值", prop: "score" },
+          { label: "分值", prop: "score", formatter: this.formatter },
 
           {
             label: "操作",