소스 검색

考勤-修复5339

zhonghuizhen 9 달 전
부모
커밋
d8b72e0fb1

+ 3 - 2
src/views/business/attendance/attendanceDetails.vue

@@ -333,13 +333,14 @@ export default {
           if (this.listData.length > 0) {
             // 做部门和姓名处理
             this.listData.forEach((item) => {
-              item.userName = this.getUserLabel(item.yong_hu_id_)
-              item.deptName = this.getDeptLabel(item.bu_men_)
+              item.userName = this.getUserLabel(item.yongHuId)
+              item.deptName = this.getDeptLabel(item.buMen)
               // 考勤状态-缺勤
               if (item.kaoQinZhuangTa === '') {
                 item.kaoQinZhuangTa = '异常'
               }
             })
+            this.pagination.totalCount = res.data.pageResult.totalCount
           }
 
         })

+ 0 - 7
src/views/business/attendance/attendanceOverview.vue

@@ -164,13 +164,6 @@ export default {
           this.loading = true
           queryAttendanceData(this.getSearchFormData()).then(res => {
               this.listData = res.data.dataResult
-              if (this.listData.length > 0) {
-                  // 做部门和姓名处理
-                  this.listData.forEach(item => {
-                      item.userName = this.getUserLabel(item.yong_hu_id_)
-                      item.deptName = this.getDeptLabel(item.bu_men_)
-                  })
-              }
               this.pagination.totalCount = res.data.pageResult?.totalCount
           }).finally(() => {
               this.loading = false

+ 1 - 0
src/views/business/attendance/makeUPVerify.vue

@@ -223,6 +223,7 @@ export default {
             item.userName = this.getUserLabel(item.yong_hu_id_)
             item.deptName = this.getDeptLabel(item.bu_men_)
           })
+          this.pagination.totalCount = res.data.pageResult?.totalCount
           this.loading = false
         })
         .catch(() => {

+ 1 - 0
src/views/business/attendance/makeUpRecords.vue

@@ -220,6 +220,7 @@ export default {
             item.userName = this.getUserLabel(item.yong_hu_id_)
             item.deptName = this.getDeptLabel(item.bu_men_)
           })
+          this.pagination.totalCount = res.data.pageResult?.totalCount
           this.loading = false
         })
         .catch(() => {

+ 3 - 2
src/views/business/attendance/personAttendanceDetails.vue

@@ -290,14 +290,15 @@ export default {
           if (this.listData.length > 0) {
             // 做部门和姓名处理
             this.listData.forEach((item) => {
-              item.userName = this.getUserLabel(item.yong_hu_id_)
-              item.deptName = this.getDeptLabel(item.bu_men_)
+              item.userName = this.getUserLabel(item.yongHuId)
+              item.deptName = this.getDeptLabel(item.buMen)
               // 考勤状态-缺勤
               if (item.kaoQinZhuangTa === '') {
                 item.kaoQinZhuangTa = '异常'
               }
 
             })
+            this.pagination.totalCount = res.data.pageResult.totalCount
           }
         })
         .finally(() => {