From e7d48e5d05e8575163e3508a1adda24f7c9141e4 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 23 十月 2023 16:08:54 +0800
Subject: [PATCH] 1.优化
---
src/views/statistic/personSalaryList.vue | 92 +++++++++++++++++++++++-----------------------
src/views/statistic/groupSalaryList.vue | 8 ++--
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/views/statistic/groupSalaryList.vue b/src/views/statistic/groupSalaryList.vue
index 5c1508a..117be34 100644
--- a/src/views/statistic/groupSalaryList.vue
+++ b/src/views/statistic/groupSalaryList.vue
@@ -191,14 +191,14 @@
sortable="custom"
/>
<el-table-column
- prop="group_name"
+ prop="usergroupname"
label="鐢熶骇鐝粍"
width="110"
show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.group_name">{{ row.group_name }}</div>
+ <div v-if="row.usergroupname">{{ row.usergroupname }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -355,14 +355,14 @@
sortable="custom"
/>
<el-table-column
- prop="group_name"
+ prop="usergroupname"
label="鐢熶骇鐝粍"
width="110"
show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.group_name">{{ row.group_name }}</div>
+ <div v-if="row.usergroupname">{{ row.usergroupname }}</div>
<div v-else>/</div>
</template>
</el-table-column>
diff --git a/src/views/statistic/personSalaryList.vue b/src/views/statistic/personSalaryList.vue
index 362724d..b0c905a 100644
--- a/src/views/statistic/personSalaryList.vue
+++ b/src/views/statistic/personSalaryList.vue
@@ -169,7 +169,7 @@
</template>
</el-table-column>
<el-table-column
- prop="stepcode"
+ prop="step_code"
label="宸ュ簭缂栫爜"
width="110"
show-tooltip-when-overflow
@@ -189,18 +189,18 @@
show-tooltip-when-overflow
sortable="custom"
/>
- <el-table-column
- prop="group_name"
- label="鐢熶骇鐝粍"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.group_name">{{ row.group_name }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="group_name"-->
+ <!-- label="鐢熶骇鐝粍"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.group_name">{{ row.group_name }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="report_qty"
label="鎶ュ伐鏁伴噺"
@@ -213,35 +213,35 @@
</template>
</el-table-column>
<el-table-column
- prop="unprice"
+ prop="step_price"
label="宸ュ簭鍗曚环"
width="110"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
+ <div v-if="row.step_price">{{ row.step_price }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="ratio"-->
+ <!-- label="鍒嗛厤姣斾緥"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.step_price">{{ row.ratio }} %</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </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"
+ prop="moneys"
label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
+ <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -347,18 +347,18 @@
show-tooltip-when-overflow
sortable="custom"
/>
- <el-table-column
- prop="group_name"
- label="鐢熶骇鐝粍"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.group_name">{{ row.group_name }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="group_name"-->
+ <!-- label="鐢熶骇鐝粍"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.group_name">{{ row.group_name }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="report_qty"
label="鎶ュ伐鏁伴噺"
@@ -371,24 +371,24 @@
</template>
</el-table-column>
<el-table-column
- prop="unprice"
+ prop="step_price"
label="宸ュ簭鍗曚环"
width="110"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
+ <div v-if="row.step_price">{{ row.step_price }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="usermoney"
+ prop="moneys"
label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
+ <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -573,7 +573,7 @@
const { columns, data } = param
const sums = []
- const i = this.form.compute === 'last' ? 11 : 10
+ const i = this.form.compute === 'last' ? 9 : 9
columns.forEach((column, index) => {
if (index === i) {
@@ -581,7 +581,7 @@
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'usermoney') {
+ if (column.property === 'moneys') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
--
Gitblit v1.9.3