From 72d29a847bda8db54c0823ce35f8ad9383e8b35d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 16 十一月 2022 10:46:35 +0800
Subject: [PATCH] 1.班组、人员工资报表求和统计
---
src/views/scgl/gd.vue | 6 +-
src/views/bbgl/bzgz.vue | 47 +++++++++++++++++++++--
src/assets/images/UP.png | 0
src/views/bbgl/rygz.vue | 47 ++++++++++++++++++++---
4 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/src/assets/images/UP.png b/src/assets/images/UP.png
index 43e475f..7bd14af 100644
--- a/src/assets/images/UP.png
+++ b/src/assets/images/UP.png
Binary files differ
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 7f38acb..75d3358 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -42,7 +42,7 @@
<el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">
<el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鎿嶄綔鏃堕棿" style="display: flex;align-items: center">
+ <el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.operdate"
type="daterange"
@@ -92,6 +92,8 @@
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
+ :summary-method="getSummaries"
+ show-summary
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
@@ -178,7 +180,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.unprice }}鍏�</div>
+ <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -189,14 +191,19 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }}鍏�</div>
+ <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="lm_user"
- label="鎿嶄綔浜哄憳"
+ label="鎶ュ伐浜哄憳"
width="110"
+ sortable="custom"
+ /> <el-table-column
+ prop="report_date"
+ label="鎶ュ伐鏃堕棿"
+ width="160"
sortable="custom"
/>
@@ -366,6 +373,37 @@
}
})
},
+ getSummaries(param) {
+ const { columns, data } = param
+ const sums = []
+
+ columns.forEach((column, index) => {
+ if (index === 10) {
+ sums[index] = '鎬讳环'
+ return
+ }
+ const values = data.map(item => Number(item[column.property]))
+ if (column.property === 'usermoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ' 鍏�'
+ } else {
+ // sums[index] = 'N/A'
+ sums[index] = ' '
+ }
+ })
+ this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ })
+
+ return sums
+ },
async getGroupSalaryReportSearch() {
let tempDate = this.form.operdate
if (tempDate.length > 0) {
@@ -386,7 +424,6 @@
rows: this.form.rows
}
- console.log(data, 1)
const res = await GroupSalaryReportSearch(data)
this.tableData = res.data
this.total = res.count
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index c4835c3..974da2e 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -90,6 +90,8 @@
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
+ :summary-method="getSummaries"
+ show-summary
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
@@ -164,13 +166,13 @@
sortable="custom"
/>
<el-table-column
- prop="good_qty"
+ prop="report_qty"
label="鎶ュ伐鏁伴噺"
width="110"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.good_qty">{{ row.good_qty }}</div>
+ <div v-if="row.report_qty">{{ row.report_qty }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -181,23 +183,23 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.unprice }}鍏�</div>
+ <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="usermoney"
- label="鐝粍璁颁欢宸ヨ祫"
+ label="涓汉璁颁欢宸ヨ祫"
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }}鍏�</div>
+ <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="lm_user"
+ prop="username"
label="鎶ュ伐浜哄憳"
width="110"
sortable="custom"
@@ -352,6 +354,39 @@
}
})
},
+ getSummaries(param) {
+ const { columns, data } = param
+ const sums = []
+
+ columns.forEach((column, index) => {
+ if (index === 10) {
+ sums[index] = '鎬讳环'
+ return
+ }
+ const values = data.map(item => Number(item[column.property]))
+ if (column.property === 'usermoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+
+ sums[index] += ' 鍏�'
+ } else {
+ // sums[index] = 'N/A'
+ sums[index] = ' '
+ }
+ })
+
+ this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ })
+
+ return sums
+ },
async getPeopleSalaryReportSearch() {
let tempDate = this.form.reportdate
if (tempDate.length > 0) {
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 72adc10..23b7184 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -1217,10 +1217,10 @@
<div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden"/>
</div>
- <div v-if="formApprove.m_po" style="margin-top: 10px;">
+ <div v-if="formApprove.m_po" style="margin-top: 5px;">
<!-- <svg-icon icon-class="UP" style="color:#000;margin-left: 130px;font-size: 50px;background-color: #FFFFFF"></svg-icon>-->
- <img src="../../assets/images/UP.png" alt="" style="margin-left: 92px;">
- <div style="font-size: 18px;font-weight: bolder;margin-left: 4px;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛屾壂鎻忔浜岀淮鐮�</div>
+ <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">
+ <div style="font-size: 18px;font-weight: bolder;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛岀敤PDA鎵弿姝や簩缁寸爜</div>
</div>
--
Gitblit v1.9.3