From 1ffde88215bc84e9e08c867f8573d0b31c17a727 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 05 一月 2023 10:15:44 +0800
Subject: [PATCH] 1.需求更改
---
src/views/bbgl/bzgz.vue | 98 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 6 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 7f38acb..7bfcd93 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -1,8 +1,28 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+
+ <div class="topRight" style="display: flex;align-items: center">
+ <!-- <div style="font-size: 14px;margin-right: 15px;color: #a7a7a7">鍓旈櫎宸ュ簭</div>-->
+ <el-select
+ v-model="form.rejectstepcode"
+ style="width: 170px;"
+ multiple
+ placeholder="璇烽�夋嫨鍓旈櫎宸ュ簭"
+ collapse-tags
+ @change="rejectstepcodeChange"
+ >
+ <el-option
+ v-for="item in StepSelectArr"
+ :key="item.stepcode"
+ :label="item.stepname"
+ :value="item.stepcode"
+ />
+ </el-select>
+ </div>
+
</div>
<div class="bodyTopFormGroup">
@@ -42,7 +62,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 +112,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 +200,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,7 +211,7 @@
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>
@@ -197,6 +219,13 @@
prop="lm_user"
label="鎿嶄綔浜哄憳"
width="110"
+ sortable="custom"
+ />
+ <!-- label="鎶ュ伐浜哄憳"-->
+ <el-table-column
+ prop="report_date"
+ label="鎶ュ伐鏃堕棿"
+ width="160"
sortable="custom"
/>
@@ -287,6 +316,7 @@
GroupSalaryReportSearchUser
} from '@/api/bbgl'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
+import { StepSelect } from '@/api/zzmx'
export default {
name: 'Zzjg',
@@ -299,6 +329,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
+ StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -308,6 +339,7 @@
groupcode: '', // 鐢熶骇鐝粍
username: '', // 鎿嶄綔浜哄憳
operdate: '', // 鎿嶄綔鏃堕棿
+ rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -317,7 +349,7 @@
total: 10,
tableData: [],
dialogVisible: false,
- tagArr: [], //
+ tagArr: [],
dialogForm: {
OrgType: '',
OrgCode: '',
@@ -363,8 +395,49 @@
this.getGroupSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
+ this.getStepSelect()
}
})
+ },
+ // 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
+ async getStepSelect() {
+ const { data: res } = await StepSelect()
+ this.StepSelectArr = res
+ },
+ // 鍓旈櫎宸ュ簭涓嬫媺閫夐」鍊煎彉鍖栨椂
+ rejectstepcodeChange(val) {
+ this.getGroupSalaryReportSearch()
+ },
+ 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
@@ -380,13 +453,13 @@
groupcode: this.form.groupcode,
username: this.form.username,
operdate: tempDate,
+ rejectstepcode: this.form.rejectstepcode.join(','),
prop: this.form.prop,
order: this.form.order,
page: this.form.page,
rows: this.form.rows
}
- console.log(data, 1)
const res = await GroupSalaryReportSearch(data)
this.tableData = res.data
this.total = res.count
@@ -674,6 +747,19 @@
height: 100% !important;
}
}
+.topRight ::v-deep {
+ input::-webkit-input-placeholder {
+ color: $main_color;
+ }
+
+ //input::-moz-input-placeholder {
+ // color: rgba(0, 204, 254, 1);
+ //}
+
+ input::-ms-input-placeholder {
+ color: $main_color;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3