From a0cfea0db1a87b627fa60540422d06ae9e1a3c70 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期日, 28 四月 2024 17:44:24 +0800
Subject: [PATCH] 产量报表和应发工资报表增加分页

---
 src/views/reportManage/productionReport/index.vue    |   23 +++++++++++++++++------
 src/views/employeeSalary/salaryPlan/index.vue        |    6 +++---
 src/views/reportManage/payableSalaryReport/index.vue |   13 +++++++------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index 881c9e9..da67aad 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -24,12 +24,12 @@
           </template>
         </TableCommonView>
       </div>
-      <AddDialog 
-      ref="add" :editRow="editRow"  @refresh="refresh" 
-      />
       <div class="btn-pager">
         <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
       </div>
+      <AddDialog 
+      ref="add" :editRow="editRow"  @refresh="refresh" 
+      />
     </div>
   </div>
 </template>
diff --git a/src/views/reportManage/payableSalaryReport/index.vue b/src/views/reportManage/payableSalaryReport/index.vue
index 31c963f..1d04dd3 100644
--- a/src/views/reportManage/payableSalaryReport/index.vue
+++ b/src/views/reportManage/payableSalaryReport/index.vue
@@ -37,9 +37,9 @@
           >
           </TableCommonView>
         </div>
-        <!-- <div class="btn-pager">
+        <div class="btn-pager">
           <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
-        </div> -->
+        </div>
       </div>
     </div> 
   </div>
@@ -127,8 +127,8 @@
       await getAttendanceStatistic({
         keyword: this.keyword,
         month:this.object.date,
-        // page: this.pagerOptions.currPage,
-        // pageSize: this.pagerOptions.pageSize
+        page: this.pagerOptions.currPage,
+        pageSize: this.pagerOptions.pageSize
       })
         .then((res) => {
           if (res.code == 200) {
@@ -171,7 +171,7 @@
                 }
               })
               this.tableList.tableInfomation = list || []
-              this.pagerOptions.totalCount = res.total
+              this.pagerOptions.totalCount = res.total||0
             } else {
               this.tableList.tableInfomation = []
             }
@@ -231,10 +231,11 @@
       background-color: #fff;
       border-radius: 12px;
       height: 100%;
+      box-sizing: border-box;
       overflow: hidden;
     }
     .list-view {
-      height: calc(100% - 10px);
+      height: calc(100% - 60px);
       overflow: hidden;
     }
     .btn-pager {
diff --git a/src/views/reportManage/productionReport/index.vue b/src/views/reportManage/productionReport/index.vue
index 8ee0aa1..1f7b1ed 100644
--- a/src/views/reportManage/productionReport/index.vue
+++ b/src/views/reportManage/productionReport/index.vue
@@ -53,9 +53,9 @@
         >
         </TableCommonView>
       </div>
-      <!-- <div class="btn-pager">
+      <div class="btn-pager">
         <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
-      </div> -->
+      </div>
     </div>
   </div>
 </template>
@@ -176,8 +176,8 @@
       await getAttendanceStatistic({
         keyword: this.keyword,
         month: "2024-04",
-        // page: this.pagerOptions.currPage,
-        // pageSize: this.pagerOptions.pageSize
+        page: this.pagerOptions.currPage,
+        pageSize: this.pagerOptions.pageSize
       })
         .then((res) => {
           if (res.code == 200) {
@@ -188,7 +188,7 @@
                 };
               });
               this.tableList.tableInfomation = list || [];
-              this.pagerOptions.totalCount = res.total;
+              this.pagerOptions.totalCount = res.total||0;
             } else {
               this.tableList.tableInfomation = [];
             }
@@ -230,9 +230,20 @@
   }
   .body-card {
     margin: 0 30px;
+    border-radius: 12px;
     background-color: #fff;
-    padding: 10px 15px;
     height: calc(100% - 180px);
   }
+  .list-view {
+    height: calc(100% - 60px);
+    overflow: hidden;
+  }
+  .btn-pager {
+    display: flex;
+    margin-top: 10px;
+    .page {
+      margin-left: auto;
+    }
+  }
 }
 </style>

--
Gitblit v1.8.0