推

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -233,7 +233,7 @@ export default {
           return false;
         }
       }
-
+      if (this.$route.name == "attendance/stat/list") {
         if (this.form.summaryTimeStart && this.form.summaryTimeEnd) {
           let startValue = Date.parse(this.form.summaryTimeStart);
           let endValue = Date.parse(this.form.summaryTimeEnd);
@@ -246,6 +246,10 @@ export default {
           this.form.summaryTimeStart = getFirstDay();
           this.form.summaryTimeEnd = getLastDay();
         }
+      } else {
+        delete this.form.summaryTimeStart;
+        delete this.form.summaryTimeEnd;
+      }
 
       let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
       let data = this.decode(params);
@@ -352,6 +356,7 @@ export default {
         }
       }
 
+      if (this.$route.name == "attendance/stat/list") {
         if (this.form.summaryTimeStart && this.form.summaryTimeEnd) {
           let startValue = Date.parse(this.form.summaryTimeStart);
           let endValue = Date.parse(this.form.summaryTimeEnd);
@@ -364,7 +369,7 @@ export default {
           this.form.summaryTimeStart = getFirstDay();
           this.form.summaryTimeEnd = getLastDay();
         }
-
+      }
       let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
       console.log(this.form, "form参数");
       let data = this.decode(params);

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

@@ -94,13 +94,13 @@ export default {
             label: "请假类型",
           },
           {
-            name: "startTime",
+            name: "createTimeStart",
             type: "date",
             label: "开始时间",
             fuzzy: false,
           },
           {
-            name: "endTime",
+            name: "createTimeEnd",
             type: "date",
             label: "结束时间",
             fuzzy: false,