From 6a973bf9be9b0ba2dd5f81b37a74b07b18781016 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期四, 13 三月 2025 16:42:15 +0800 Subject: [PATCH] 工时管理-查询参数修改 --- src/views/performance/manHour/workTimeManagement.vue | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue index 3585646..c32c29e 100644 --- a/src/views/performance/manHour/workTimeManagement.vue +++ b/src/views/performance/manHour/workTimeManagement.vue @@ -42,7 +42,7 @@ </div> </div> <div style="display: flex; align-items: center; justify-content: space-between"> - <el-radio-group :key="'111'" v-model="currentTable" size="small"> + <el-radio-group :key="'111'" v-model="currentTable" size="small" @change="searchList"> <el-radio-button label="ValueTable0"> 杈呭姪宸ユ椂 </el-radio-button> <el-radio-button label="ValueTable1"> 浜ч噺宸ユ椂 </el-radio-button> </el-radio-group> @@ -78,9 +78,11 @@ </div> <div class="table"> <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading" + key="tableData" :height="'calc(100vh - 350px)'" :isSelection="true" v-if="currentTable == 'ValueTable0'" @pagination="pagination" :handleSelectionChange="handleSelectionChange"></lims-table> <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading" + key="tableData0" :height="'calc(100vh - 350px)'" v-if="currentTable == 'ValueTable1'" @pagination="pagination0"></lims-table> </div> <el-dialog :before-close="handleClose" :title="formData.id ? '缂栬緫' : '褰曞叆鏁版嵁'" :visible.sync="addVisible" @@ -505,10 +507,17 @@ this.getCurrentWeekNumber(); this.collectWorkingHours(); this.selectshiftByUser(); - this.getList(); - this.getList0(); + this.searchList() }, methods: { + searchList() { + if (this.currentTable == 'ValueTable0') { + this.getList(); + } else { + this.getList0(); + } + }, + // 鏌ヨ杈呭姪宸ユ椂鍒楄〃 getList(entity) { this.tableLoading = true; let param = {}; @@ -531,6 +540,7 @@ this.tableLoading = false; }); }, + // 鏌ヨ浜ч噺宸ユ椂鍒楄〃 getList0(entity) { this.tableLoading = true; let param = {}; @@ -541,6 +551,7 @@ param.dateTime = param.dateTime?.length > 0 ? JSON.stringify(param.dateTime) : null } delete param.total; + delete param.state; selectAuxiliaryOutputWorkingHours({ ...param }) .then((res) => { this.tableLoading = false; @@ -814,6 +825,7 @@ } entity.weekDay = this.entity.weekDay; entity.name = this.entity.name; + entity.state = this.entity.state; collectWorkingHours(entity).then((res) => { this.totalInfo = res.data; }); -- Gitblit v1.9.3