From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/performance/manHour/workTimeStatistics.vue | 118 ++++++++++++++++++++++-------------------------------------
1 files changed, 44 insertions(+), 74 deletions(-)
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index 9b89a33..422aa61 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/src/views/performance/manHour/workTimeStatistics.vue
@@ -1,57 +1,54 @@
<template>
- <div>
+ <div class="capacity-scope">
<div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏃ユ湡锛�</div>
- <div class="search_input" style="display: flex; align-items: center">
- <el-date-picker
- v-model="queryParams.month"
- :clearable="false"
- format="yyyy-MM"
- placeholder="閫夋嫨鏈�"
- size="small"
- style="width: 100%"
- type="month"
- value-format="yyyy-MM"
- @change="refreshTable()"
- >
- </el-date-picker>
- </div>
- </div>
- <div class="search_thing">
- <div class="search_label">鍛樺伐锛�</div>
- <el-input
- v-model="queryParams.name"
- clearable
- placeholder="璇疯緭鍏�"
- size="small"
- @keyup.enter.native="refreshTable()"
- ></el-input>
- </div>
- <div class="search_thing" style="padding-left: 30px">
- <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
- <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
+ <div>
+ <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
+ <el-form-item label="鏃ユ湡" prop="month">
+ <el-date-picker
+ v-model="queryParams.month"
+ :clearable="false"
+ format="yyyy-MM"
+ placeholder="閫夋嫨鏈�"
+ size="small"
+ style="width: 100%"
+ type="month"
+ value-format="yyyy-MM"
+ @change="refreshTable()"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鍛樺伐" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ clearable
+ placeholder="璇疯緭鍏�"
+ size="small"
+ @keyup.enter.native="refreshTable()"
+ ></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
</div>
</div>
- <div class="table">
- <limsTable
- :column="tableColumn"
- :table-data="tableData"
- :table-loading="tableLoading"
- :page="page"
- style="padding: 0 15px"
- :height="'calc(100vh - 290px)'"
- @pagination="pagination"
- >
- </limsTable>
- </div>
+ <limsTable
+ :column="tableColumn"
+ :table-data="tableData"
+ :table-loading="tableLoading"
+ :page="page"
+ :height="'calc(100vh - 290px)'"
+ @pagination="pagination"
+ >
+ </limsTable>
</div>
</div>
</template>
<script>
-import { getYearAndMonthAndDays } from "@/utils/date";
+import { getYearAndMonthAndDays, getYearAndMonthAndDaysZTZB } from "@/utils/date";
import limsTable from "@/components/Table/lims-table.vue";
import { selectAuxiliaryAllByMonth } from "@/api/performance/manHour";
export default {
@@ -61,7 +58,7 @@
data() {
return {
queryParams: {
- month: getYearAndMonthAndDays().slice(0, 7),
+ month: getYearAndMonthAndDaysZTZB().slice(0, 7),
name: "",
departLims: "",
},
@@ -96,7 +93,7 @@
tableLoading: false,
page: {
total: 0,
- size: 10,
+ size: 20,
current: 0,
},
};
@@ -118,7 +115,7 @@
},
refresh() {
this.queryParams = {
- month: getYearAndMonthAndDays().slice(0, 7),
+ month: getYearAndMonthAndDaysZTZB().slice(0, 7),
name: "",
departLims: "",
};
@@ -135,32 +132,5 @@
</script>
<style scoped>
-.work-time-statistics {
- height: 100%;
-}
-.search {
- background-color: #fff;
- height: 80px;
- display: flex;
- align-items: center;
-}
-.search_thing {
- width: 270px;
- display: flex;
- align-items: center;
-}
-
-.search_label {
- width: 60px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: calc(100% - 60px);
-}
-.table {
- height: calc(100% - 60px - 80px - 10px - 40px - 25px);
-}
</style>
--
Gitblit v1.9.3