From c2f67da5b5086f6e3e4bc01f61e81e0505a17d10 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 28 二月 2023 16:58:22 +0800
Subject: [PATCH] 1.质检方案对接接口中
---
src/views/bbgl/rygz.vue | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 300a4fe..79a8ad6 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -88,17 +88,17 @@
<el-tabs type="border-card" style="margin-top: 10px" @tab-click="tabClick">
<el-tab-pane label="鏈亾宸ュ簭">
- <div class="elTableDiv">
+ <div class="elTableDiv" style="margin: 0 auto 10px;">
<el-table
- ref="tableDataRef2"
+ ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
+ :height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
border
:summary-method="getSummaries"
show-summary
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -198,6 +198,17 @@
</template>
</el-table-column>
<el-table-column
+ prop="ratio"
+ label="宸ュ簭鍗曚环"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.unprice">{{ row.ratio }} %</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="usermoney"
label="涓汉璁颁欢宸ヨ祫"
width="130"
@@ -235,17 +246,17 @@
/>
</el-tab-pane>
<el-tab-pane label="閫愰亾宸ュ簭">
- <div class="elTableDiv">
+ <div class="elTableDiv" style="margin: 0 auto 10px;">
<el-table
- ref="tableDataRef"
+ ref="tableDataRef2"
class="tableFixed"
- :data="tableData"
- :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
+ :data="tableData2"
+ :height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
border
:summary-method="getSummaries"
show-summary
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -468,6 +479,7 @@
groupArr: [],
total: 10,
tableData: [],
+ tableData2: [],
dialogVisible: false,
tagArr: [], //
dialogForm: {
@@ -581,7 +593,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