zq

src/views/base/personDeviceLog-list.vue

@@ -166,6 +166,7 @@
       <el-table-column prop="device" label="设备别称" width="220">
         <template slot-scope="{row}">{{row.device == null ? "" : row.device.aliasName}}</template>
       </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" width="180"></el-table-column>
     </el-table>
     <el-pagination
       :current-page.sync="pageIndex"

src/views/business/workAttendance-list.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     v-loading="downloadLoading"
-    element-loading-text="加载中"
+    element-loading-text="导出中"
     element-loading-spinner="el-icon-loading"
   >
     <el-breadcrumb separator=">">
@@ -123,9 +123,17 @@
         v-show="batchUpdateVisible"
       >重新生成考勤数据</el-button>
     </el-row>
-    <el-table ref="formTable" stripe :data="tableData" :height="tableHeight" style="width: 100%" v-loading="loading">
+    <el-table 
+    ref="formTable" 
+    stripe 
+    :data="tableData" 
+    :height="tableHeight" 
+    style="width: 100%" 
+    v-loading="loading"
+    :element-loading-text="loadingText">
       <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="personId"></el-table-column>
       <el-table-column label="公司" prop="companyName" width="200"></el-table-column>
       <el-table-column label="上级部门" prop="parentDepartmentName" width="200"></el-table-column>
       <el-table-column label="部门" prop="departmentName" width="200"></el-table-column>
@@ -199,6 +207,7 @@ export default {
         position5: ""
       },
       loading: false,
+      loadingText: "加载中",
       tableData: [],
       pageIndex: 1,
       pageSize: 20,
@@ -360,12 +369,13 @@ export default {
       formData.append("position4", self.queryModel.position4);
       formData.append("position5", self.queryModel.position5);
 
-      self.downloadLoading = true;
+      self.loading = true;
+      self.loadingText = "加载中";
 
       workAttendanceApi.statList(formData).then(function(response) {
         var jsonData = response.data;
 
-        self.downloadLoading = false;
+        self.loading = false;
 
         if (jsonData.result) {
           self.tableData = jsonData.data.data;
@@ -378,7 +388,7 @@ export default {
           //45为分页栏的高度
           //页面高度-列表上面的高度-分页栏高度
           self.tableHeight =
-            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
         } else {
           self.$message({
             type: "warning",
@@ -530,6 +540,7 @@ export default {
       formData.append("endDate", this.queryModel.timeRanges[1]);
 
       self.loading = true;
+      self.loadingText = "考勤数据生成中...";
 
       workAttendanceApi.batchUpdate(formData).then(function(response) {
         var jsonData = response.data;
@@ -541,6 +552,8 @@ export default {
             type: "success",
             message: jsonData.message + ""
           });
+
+          self.handleQuery();
         } else {
           self.$message({
             type: "warning",