From 1ccee4c44055c977374a7675063cd241ccfcfe5b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 18:23:51 +0800
Subject: [PATCH] 纤度检验表 车间不显示的问题修改
---
src/views/reportManage/payableSalaryReport/index.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/views/reportManage/payableSalaryReport/index.vue b/src/views/reportManage/payableSalaryReport/index.vue
index d5641ab..21f44a8 100644
--- a/src/views/reportManage/payableSalaryReport/index.vue
+++ b/src/views/reportManage/payableSalaryReport/index.vue
@@ -12,12 +12,13 @@
>
<template slot="leftButton">
<div class="margin_right_20px" style="width:200px;">
- <el-date-picker v-model="object.date" style="width:100%"
+ <!-- <el-date-picker v-model="object.date" style="width:100%"
@change="onFilterSearch"
:clearable="false" type="month" placeholder="閫夋嫨鏃ユ湡"
:picker-options="pickerOptions"
value-format="yyyy-MM">
- </el-date-picker>
+ </el-date-picker> -->
+ <el-button size="small" type="primary" @click="exportBtnClick">瀵煎嚭</el-button>
</div>
</template>
</CommonSearch>
@@ -36,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;
@@ -126,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) {
@@ -170,7 +171,7 @@
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.total
+ this.pagerOptions.totalCount = res.total||0
} else {
this.tableList.tableInfomation = []
}
@@ -194,6 +195,8 @@
inputContent( prop, row, scope){
console.log(prop,'---',row,'---',scope)
},
+ // 瀵煎嚭
+ exportBtnClick() {}
}
}
</script>
@@ -223,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