From 544f30e28a3d8ea41e5ea8c0add2ce77c1b6fb1a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 17:48:31 +0800
Subject: [PATCH] 工种管理模块 编辑工种接口400的问题修改+增加如果启用不达标保底，则必须输入保底工资的逻辑
---
src/views/reportManage/payableSalaryReport/index.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/reportManage/payableSalaryReport/index.vue b/src/views/reportManage/payableSalaryReport/index.vue
index 31c963f..21f44a8 100644
--- a/src/views/reportManage/payableSalaryReport/index.vue
+++ b/src/views/reportManage/payableSalaryReport/index.vue
@@ -37,16 +37,16 @@
>
</TableCommonView>
</div>
- <!-- <div class="btn-pager">
+ <div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
- </div> -->
+ </div>
</div>
</div>
</div>
</template>
<script>
-import { getAttendanceStatistic } from "@/api/employeeSalary/attendanceManage.js"
+import { getAttendanceStatistic } from "@/api/reportManage/report.js"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import NewDate from "@/api/date";
const { getCurrentMonth } = NewDate;
@@ -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 = []
}
@@ -226,15 +226,16 @@
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
- height: calc(100% - 92px);
+ height: calc(100% - 102px);
.body-card {
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 {
--
Gitblit v1.8.0