From f13043863ba71ef3308c1ec216b3d73223cd1711 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 16 十一月 2022 10:50:44 +0800
Subject: [PATCH] 1.班组、人员工资报表求和统计
---
src/views/bbgl/bzgz.vue | 47 ++++++++-
src/router/index.js | 180 ++++++++++++++++++------------------
src/views/bbgl/rygz.vue | 47 ++++++++-
3 files changed, 173 insertions(+), 101 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index d3929b8..0461f1b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -151,13 +151,13 @@
component: () => import('@/views/jcsz/wldw'),
meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
},
- // {
- // path: 'adsz',
- // name: 'ADZZCancel',
- // code: '1014',
- // component: () => import('@/views/jcsz/adsz'),
- // meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
- // }
+ {
+ path: 'adsz',
+ name: 'ADZZCancel',
+ code: '1014',
+ component: () => import('@/views/jcsz/adsz'),
+ meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
+ }
]
},
{
@@ -169,26 +169,26 @@
meta: { code: '1002', title: '璁惧绠＄悊', icon: 'example' },
alwaysShow: true,
children: [
- // {
- // path: 'sblx',
- // name: 'SBLXCancel',
- // code: '1020',
- // component: () => import('@/views/sbgl/sblx'),
- // meta: { code: '1020', title: '璁惧绫诲瀷', icon: '', keepAlive: true }
- // },
- // {
- // path: 'wxjl',
- // code: '1029Cancel',
- // name: 'WXJL',
- // component: () => import('@/views/sbgl/wxjl'),
- // meta: { code: '1029', title: '缁翠慨璁板綍', icon: '', keepAlive: true }
- // }, {
- // path: 'sbz',
- // name: 'SBZCancel',
- // code: '1021',
- // component: () => import('@/views/sbgl/sbz'),
- // meta: { code: '1021', title: '璁惧缁�', icon: '', keepAlive: true }
- // },
+ {
+ path: 'sblx',
+ name: 'SBLXCancel',
+ code: '1020',
+ component: () => import('@/views/sbgl/sblx'),
+ meta: { code: '1020', title: '璁惧绫诲瀷', icon: '', keepAlive: true }
+ },
+ {
+ path: 'wxjl',
+ code: '1029Cancel',
+ name: 'WXJL',
+ component: () => import('@/views/sbgl/wxjl'),
+ meta: { code: '1029', title: '缁翠慨璁板綍', icon: '', keepAlive: true }
+ }, {
+ path: 'sbz',
+ name: 'SBZCancel',
+ code: '1021',
+ component: () => import('@/views/sbgl/sbz'),
+ meta: { code: '1021', title: '璁惧缁�', icon: '', keepAlive: true }
+ },
{
path: 'sbqd',
name: 'sbqdCancel',
@@ -196,48 +196,48 @@
component: () => import('@/views/sbgl/sbqd'),
meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
},
- // {
- // path: 'djbz',
- // name: 'DJBZCancel',
- // code: '1023',
- // component: () => import('@/views/sbgl/djbz'),
- // meta: { code: '1023', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
- // },
- // {
- // path: 'djbw',
- // name: 'DJBWCancel',
- // code: '1024',
- // component: () => import('@/views/sbgl/djbw'),
- // meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
- // },
- // {
- // path: 'bybz',
- // name: 'BYBZCancel',
- // code: '1025',
- // component: () => import('@/views/sbgl/bybz'),
- // meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
- // },
- // {
- // path: 'bybw',
- // name: 'BYBWCancel',
- // code: '1026',
- // component: () => import('@/views/sbgl/bybw'),
- // meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
- // },
- // {
- // path: 'djjl',
- // name: 'DJJLCancel',
- // code: '1027',
- // component: () => import('@/views/sbgl/djjl'),
- // meta: { code: '1027', title: '鐐规璁板綍', icon: '', keepAlive: true }
- // },
- // {
- // path: 'byjl',
- // name: 'BYJLCancel',
- // code: '1028',
- // component: () => import('@/views/sbgl/byjl'),
- // meta: { code: '1028', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
- // }
+ {
+ path: 'djbz',
+ name: 'DJBZCancel',
+ code: '1023',
+ component: () => import('@/views/sbgl/djbz'),
+ meta: { code: '1023', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'djbw',
+ name: 'DJBWCancel',
+ code: '1024',
+ component: () => import('@/views/sbgl/djbw'),
+ meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'bybz',
+ name: 'BYBZCancel',
+ code: '1025',
+ component: () => import('@/views/sbgl/bybz'),
+ meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'bybw',
+ name: 'BYBWCancel',
+ code: '1026',
+ component: () => import('@/views/sbgl/bybw'),
+ meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'djjl',
+ name: 'DJJLCancel',
+ code: '1027',
+ component: () => import('@/views/sbgl/djjl'),
+ meta: { code: '1027', title: '鐐规璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'byjl',
+ name: 'BYJLCancel',
+ code: '1028',
+ component: () => import('@/views/sbgl/byjl'),
+ meta: { code: '1028', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
+ }
]
},
{
@@ -390,13 +390,13 @@
component: () => import('@/views/zzmx/chda'),
meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
},
- // {
- // path: 'wlqd',
- // name: 'WLQDCancel',
- // code: '1062',
- // component: () => import('@/views/zzmx/wlqd'),
- // meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
- // },
+ {
+ path: 'wlqd',
+ name: 'WLQDCancel',
+ code: '1062',
+ component: () => import('@/views/zzmx/wlqd'),
+ meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
+ },
{
path: 'gylx',
name: 'GYLXCancel',
@@ -587,13 +587,13 @@
component: () => import('@/views/xtsz/bmgz'),
meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
},
- // {
- // path: 'mmxg',
- // name: 'MMXGCancel',
- // code: '1102',
- // component: () => import('@/views/xtsz/mmxg'),
- // meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
- // },
+ {
+ path: 'mmxg',
+ name: 'MMXGCancel',
+ code: '1102',
+ component: () => import('@/views/xtsz/mmxg'),
+ meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
+ },
{
path: 'xtrz',
name: 'XTRZCancel',
@@ -607,13 +607,13 @@
component: () => import('@/views/xtsz/sc'),
meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
},
- // {
- // path: 'cjgg',
- // name: 'CJGGancel',
- // code: '1105',
- // component: () => import('@/views/xtsz/cjgg'),
- // meta: { code: '1105', title: '杞﹂棿鍏憡', icon: '', keepAlive: true }
- // }
+ {
+ path: 'cjgg',
+ name: 'CJGGancel',
+ code: '1105',
+ component: () => import('@/views/xtsz/cjgg'),
+ meta: { code: '1105', title: '杞﹂棿鍏憡', icon: '', keepAlive: true }
+ }
]
}
]
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) {
--
Gitblit v1.9.3