Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue

@@ -47,7 +47,7 @@
         </div>
         <div class="search">
           <el-input
-            placeholder="请输入考核内容关键字搜索"
+            placeholder="请输入考核内容简称/评分标准关键字搜索"
             style="width: 300px;margin-right: 10px;"
             v-model="searchValue"
           ></el-input>
@@ -113,7 +113,7 @@ export default {
           { type: "index", label: "序号", width: 50 },
 
           { label: "分类", prop: "categoryId", formatter: this.formatter },
-          { label: "考核名称", prop: "name" },
+          { label: "考核内容简称", prop: "name" },
 
           { label: "考核编码", prop: "ruleCode" },