Merge remote-tracking branch 'origin/master'

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

@@ -335,8 +335,6 @@ export default {
     },
     /** 导出Excel */
     doExport() {
-      this.isExport = true;
-      this.progress = true;
       let params = {};
       for (let value of this.config.search) {
         if (this.query[value.name]) {
@@ -349,6 +347,15 @@ export default {
       if (this.checkList.length > 0) {
         params["properties"] = this.checkList;
       }
+      let flag = this.checkDate(
+        params.attendanceDateStart,
+        params.attendanceDateEnd,
+        1
+      );
+      if (!flag) {
+        this.isExport = true;
+
+        this.progress = true;
         this.$download(
           "/attendance/record/exportExcel",
           {
@@ -356,18 +363,43 @@ export default {
           },
           { type: "excel" }
         )
-        .then(() => {
+          .then((res) => {
             this.percent = 100;
             this.progress = false;
             this.isExport = false;
             this.checkList = [];
           })
           .catch((error) => {
+            this.percent = 100;
             this.progress = false;
 
             this.isExport = false;
             this.$message.error(error.message);
           });
+      }
+    },
+    checkDate(startTime, endTime, compDay) {
+      if (startTime == "" || startTime == null || startTime == undefined) {
+        this.$message.error("开始时间为空，请检查！");
+        return true;
+      }
+      if (endTime == "" || endTime == null || endTime == undefined) {
+        this.$message.error("结束时间为空，请检查！");
+        return true;
+      }
+      var data1 = Date.parse(startTime.replace(/-/g, "/"));
+      var data2 = Date.parse(endTime.replace(/-/g, "/"));
+      var datadiff = data2 - data1;
+      var time = parseInt(compDay) * (60 * 60 * 24 * 1000);
+      if (datadiff < 0) {
+        this.$message.error("开始时间应小于结束时间");
+        return true;
+      }
+      if (datadiff > time) {
+        this.$message.error("时间间隔大于" + parseInt(compDay) + "天，请检查!");
+        return true;
+      }
+      return false;
     },
     setdialog() {
       this.isdialog = true;