zq

src/views/business/workAttendance-list.vue

@@ -519,43 +519,49 @@ export default {
       var month = parseInt(date.getMonth() + 1);
       var startTime = date.getFullYear() + "-" + month + "-" + date.getDate();
 
-      var lastDate = new Date();
-      //设置为第一天
-      lastDate.setDate(1);
-      var lastMonth = parseInt(lastDate.getMonth() + 2);
-      var endTime = lastDate.getFullYear() + "-" + lastMonth + "-" + lastDate.getDate();
+      date.setMonth(date.getMonth()+1);
+      var lastDate = new Date(date.getTime()-1000*60*60*24);
+      
+      var endTime = lastDate.getFullYear() + "-" + month + "-" + lastDate.getDate();
       
       self.queryModel.timeRanges = [startTime, endTime];
     },
     handleBatchUpdate() {
       var self = this;
-      var formData = new FormData();
-
-      formData.append("companyId", this.queryModel.companyId);
-      formData.append("startDate", this.queryModel.timeRanges[0]);
-      formData.append("endDate", this.queryModel.timeRanges[1]);
-
-      self.loading = true;
-      self.loadingText = "考勤数据生成中...";
 
-      workAttendanceApi.batchUpdate(formData).then(function(response) {
-        var jsonData = response.data;
-
-        self.loading = false;
-
-        if (jsonData.result) {
-          self.$message({
-            type: "success",
-            message: jsonData.message + ""
-          });
-
-          self.handleQuery();
-        } else {
-          self.$message({
-            type: "warning",
-            message: jsonData.message + ""
-          });
-        }
+      self.$confirm("是否确认更新考勤数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+      }).then(() => {
+        var formData = new FormData();
+
+        formData.append("companyId", this.queryModel.companyId);
+        formData.append("startDate", this.queryModel.timeRanges[0]);
+        formData.append("endDate", this.queryModel.timeRanges[1]);
+
+        self.loading = true;
+        self.loadingText = "考勤数据生成中...";
+
+        workAttendanceApi.batchUpdate(formData).then(function(response) {
+          var jsonData = response.data;
+
+          self.loading = false;
+
+          if (jsonData.result) {
+            self.$message({
+              type: "success",
+              message: jsonData.message + ""
+            });
+
+            self.handleQuery();
+          } else {
+            self.$message({
+              type: "warning",
+              message: jsonData.message + ""
+            });
+          }
+        });
       });
     }
   },