Merge remote-tracking branch 'origin/master'

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

@@ -453,15 +453,16 @@ export default {
               : "";
           }
           this.form.checkResult = 1;
+          this.form.view = "核查";
+
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,
             categoryId: this.form.categoryId,
           }).then((res) => {
-            this.ruleArr = res.data.data;
+            this.kaoqinArr = res.data.data;
+            this.open = true;
           });
-          this.form.view = "核查";
-          this.open = true;
         }
       );
       this.pageInfo.type = "edit";

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

@@ -492,7 +492,7 @@ export default {
             size: -1,
             categoryId: this.form.categoryId,
           }).then((res) => {
-            this.ruleArr = res.data.data;
+            this.kaoqinArr = res.data.data;
           });
           this.form.view = "核查";
           this.open = true;

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

@@ -465,7 +465,7 @@ export default {
             size: -1,
             categoryId: this.form.categoryId,
           }).then((res) => {
-            this.ruleArr = res.data.data;
+            this.kaoqinArr = res.data.data;
           });
           this.form.view = "核查";
           this.open = true;

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

@@ -458,7 +458,7 @@ export default {
             size: -1,
             categoryId: this.form.categoryId,
           }).then((res) => {
-            this.ruleArr = res.data.data;
+            this.kaoqinArr = res.data.data;
           });
           this.form.view = "核查";
           this.open = true;

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

@@ -457,7 +457,7 @@ export default {
             size: -1,
             categoryId: this.form.categoryId,
           }).then((res) => {
-            this.ruleArr = res.data.data;
+            this.kaoqinArr = res.data.data;
           });
           this.form.view = "核查";
           this.open = true;

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

@@ -458,7 +458,7 @@ export default {
             size: -1,
             categoryId: this.form.categoryId,
           }).then((res) => {
-            this.ruleArr = res.data.data;
+            this.kaoqinArr = res.data.data;
           });
           this.form.view = "核查";
           this.open = true;