From 557334431db09d85b7bb54e3f2a2226d46d323a5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 15 二月 2023 15:54:09 +0800
Subject: [PATCH] 1.提交
---
src/views/bbgl/bzgz.vue | 11 +++++++++--
src/views/bbgl/rygz.vue | 10 ++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index bb74344..9ccca7a 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -258,7 +258,7 @@
<el-table
ref="tableDataRef2"
class="tableFixed"
- :data="tableData"
+ :data="tableData2"
:height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
border
:summary-method="getSummaries"
@@ -508,6 +508,7 @@
groupArr: [],
total: 10,
tableData: [],
+ tableData2: [],
dialogVisible: false,
tagArr: [], //
dialogForm: {
@@ -618,7 +619,13 @@
}
const res = await GroupSalaryReportSearch(data)
- this.tableData = res.data
+ if (this.form.compute === 'last') {
+ this.tableData = res.data
+ }
+ if (this.form.compute === 'contin') {
+ this.tableData2 = res.data
+ }
+
this.total = res.count
return { code: res.code }
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 300a4fe..676909c 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -239,7 +239,7 @@
<el-table
ref="tableDataRef"
class="tableFixed"
- :data="tableData"
+ :data="tableData2"
:height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
border
:summary-method="getSummaries"
@@ -468,6 +468,7 @@
groupArr: [],
total: 10,
tableData: [],
+ tableData2: [],
dialogVisible: false,
tagArr: [], //
dialogForm: {
@@ -581,7 +582,12 @@
}
const res = await PeopleSalaryReportSearch(data)
- this.tableData = res.data
+ if (this.form.compute === 'last') {
+ this.tableData = res.data
+ }
+ if (this.form.compute === 'contin') {
+ this.tableData2 = res.data
+ }
this.total = res.count
return { code: res.code }
--
Gitblit v1.9.3