Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

.env.development

@@ -1,5 +1,6 @@
 OUT_PUT_DIR=dist/jp-housekeeper-portal
 
+#VUE_APP_BACKEND_URL=http://127.0.0.1:7070/xpgj
 VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com

src/api/business/workAttendance.js

@@ -17,8 +17,11 @@ function getFirstExcelData(){
   return request.get(constant.serverUrl + "/home/getFirstExcelData");
 }
 
+function batchUpdate(formData){
+  return request.post(constant.serverUrl + "/business/workAttendance/batchUpdate", formData);
+}
 
 
 export default {
-  statList,exportXls,getFirstData,getFirstExcelData
+  statList,exportXls,getFirstData,getFirstExcelData,batchUpdate
 }

src/views/base/applicationExamine-list.vue

@@ -194,6 +194,7 @@ export default {
         label: "name",
         children: "children",
       },
+      companyResult: []
     };
   },
   created() {

src/views/business/workAttendance-list.vue

@@ -113,8 +113,16 @@
         :loading="downloadLoading"
         @click="exportXls"
       >导出数据</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-edit"
+        :loading="loading"
+        @click="handleBatchUpdate"
+      >重新生成考勤数据</el-button>
     </el-row>
-    <el-table ref="formTable" stripe :data="tableData" :height="tableHeight" style="width: 100%">
+    <el-table ref="formTable" stripe :data="tableData" :height="tableHeight" style="width: 100%" v-loading="loading">
       <el-table-column label="序号" fixed="left" type="index" :index="indexMethod"></el-table-column>
       <el-table-column label="姓名" fixed="left" prop="name"></el-table-column>
       <el-table-column label="公司" prop="companyName" width="200"></el-table-column>
@@ -499,9 +507,37 @@ export default {
       //设置为第一天
       lastDate.setDate(1);
       var lastMonth = parseInt(lastDate.getMonth() + 2);
-      var endTime =
-        lastDate.getFullYear() + "-" + lastMonth + "-" + lastDate.getDate();
+      var endTime = lastDate.getFullYear() + "-" + lastMonth + "-" + 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;
+
+      workAttendanceApi.batchUpdate(formData).then(function(response) {
+        var jsonData = response.data;
+
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.$message({
+            type: "success",
+            message: jsonData.message + ""
+          });
+        } else {
+          self.$message({
+            type: "warning",
+            message: jsonData.message + ""
+          });
+        }
+      });
     }
   },
   mounted: function() {},