Merge remote-tracking branch 'origin/master'

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

@@ -209,6 +209,7 @@ export default {
           {
             label: "异常时间",
             prop: "errorTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -217,6 +218,7 @@ export default {
           {
             label: "实际打卡时间",
             prop: "actualAttendTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -240,6 +242,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -260,6 +263,7 @@ export default {
           {
             label: "核查时间",
             prop: "checkTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -273,7 +277,6 @@ export default {
 
           {
             label: "操作",
-            width: 200,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

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

@@ -222,6 +222,7 @@ export default {
           {
             label: "投诉时间",
             prop: "complainTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -247,6 +248,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -266,6 +268,7 @@ export default {
           {
             label: "核查时间",
             prop: "checkTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -279,7 +282,6 @@ export default {
 
           {
             label: "操作",
-            width: 200,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

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

@@ -214,6 +214,7 @@ export default {
           {
             label: "发生时间",
             prop: "happenTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -226,6 +227,7 @@ export default {
           {
             label: "报警时间",
             prop: "alarmTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -247,6 +249,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -267,6 +270,7 @@ export default {
           {
             label: "核查时间",
             prop: "checkTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -280,7 +284,6 @@ export default {
 
           {
             label: "操作",
-            width: 200,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

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

@@ -214,6 +214,7 @@ export default {
           {
             label: "办理时间",
             prop: "goworkTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -235,6 +236,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -255,6 +257,7 @@ export default {
           {
             label: "核查时间",
             prop: "checkTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -268,7 +271,6 @@ export default {
 
           {
             label: "操作",
-            width: 200,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

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

@@ -213,6 +213,7 @@ export default {
           {
             label: "发生时间",
             prop: "happenTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -243,6 +244,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -263,6 +265,7 @@ export default {
           {
             label: "核查时间",
             prop: "checkTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -276,7 +279,6 @@ export default {
 
           {
             label: "操作",
-            width: 200,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

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

@@ -223,6 +223,7 @@ export default {
           {
             label: "评价时间",
             prop: "reviewTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -244,6 +245,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -264,6 +266,7 @@ export default {
           {
             label: "核查时间",
             prop: "checkTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
@@ -277,7 +280,6 @@ export default {
 
           {
             label: "操作",
-            width: 200,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue

@@ -102,12 +102,16 @@ export default {
       }
     },
     handleClick() {
+      this.query.page = 1;
+      this.query.size = 10;
       this.getData();
     },
     getData() {
       this.activeName == 1 || this.activeName == 2
         ? this.$post("/perform/attend/appeal/list", {
             processStatus: this.activeName,
+            page: this.query.page,
+            size: this.query.size,
           }).then((res) => {
             if (res.code == 1) {
               this.tableData = res.data;