Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/record/error/list.vue

@@ -177,18 +177,18 @@ export default {
             formatter: this.formatterDate,
             width: 160,
           },
-          {
-            label: "处理时间",
-            prop: "operDateTime",
-            formatter: this.formatterDate,
-            width: 160,
-          },
+          // {
+          //   label: "处理时间",
+          //   prop: "operDateTime",
+          //   formatter: this.formatterDate,
+          //   width: 160,
+          // },
           {
             label: "处理状态",
             prop: "processStatus",
             formatter: this.formattereDealStatus,
           },
-          { label: "处理人", prop: "opertor", formatter: this.formatters },
+          // { label: "处理人", prop: "opertor", formatter: this.formatters },
           { label: "备注", prop: "remark", formatter: this.formatters },
           {
             label: "操作",

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

@@ -153,7 +153,8 @@ export default {
     },
     async getData() {
       await this.$post(
-        this.type == 1 ? "/perform/dept/conf/list" : "/perform/staff/conf/list"
+        this.type == 1 ? "/perform/dept/conf/list" : "/perform/staff/conf/list",
+        { page: 1, size: -1 }
       ).then((res) => {
         if (res.code == 1) {
           this.dataList = res.data.data;