From f5389299d31e2236d399e48cfc1b09e5dd16f4c1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 20 三月 2023 10:01:39 +0800
Subject: [PATCH] 1.看板样式优化
---
src/views/bbgl/rygz.vue | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 16 deletions(-)
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 300a4fe..1575232 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -1,8 +1,34 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+
+ <div
+ style="color: red;margin: 10px 5px 0 0;"
+ >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
+ </div>
+
+ <!-- <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-->
+ <!-- filterable-->
+ <!-- clearable-->
+ <!-- @change="getPeopleSalaryReportSearch"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in StepSelectArr"-->
+ <!-- :key="item.stepcode"-->
+ <!-- :label="item.stepname"-->
+ <!-- :value="item.stepcode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </div>-->
</div>
<div class="bodyTopFormGroup">
@@ -88,17 +114,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,8 +224,19 @@
</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="涓汉璁颁欢宸ヨ祫"
+ label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
@@ -235,17 +272,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"
@@ -346,7 +383,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="涓汉璁颁欢宸ヨ祫"
+ label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
@@ -437,6 +474,7 @@
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { StepSelect } from '@/api/zzmx'
export default {
name: 'Zzjg',
@@ -450,6 +488,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
+ StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -459,6 +498,7 @@
groupcode: '', // 鐢熶骇鐝粍
reportname: '', // 鎿嶄綔浜哄憳
reportdate: '', // 鎿嶄綔鏃堕棿
+ rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡
prop: 'partcode', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -468,6 +508,7 @@
groupArr: [],
total: 10,
tableData: [],
+ tableData2: [],
dialogVisible: false,
tagArr: [], //
dialogForm: {
@@ -521,15 +562,23 @@
this.getPeopleSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
+ this.getStepSelect()
}
})
+ },
+ // 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
+ async getStepSelect() {
+ const { data: res } = await StepSelect()
+ this.StepSelectArr = res
},
getSummaries(param) {
const { columns, data } = param
const sums = []
+ const i = this.form.compute === 'last' ? 11 : 10
+
columns.forEach((column, index) => {
- if (index === 10) {
+ if (index === i) {
sums[index] = '鎬讳环'
return
}
@@ -538,9 +587,10 @@
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
- return prev + curr
+ // return prev + curr
+ return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
} else {
- return prev
+ return Math.round(prev * 100) / 100
}
}, 0)
@@ -555,7 +605,10 @@
this.$refs.tableDataRef.doLayout()
this.$refs.tableDataRef2.doLayout()
})
+ // (Math.round(sums * 100) / 100).toS
+ // console.log(typeof sums)
+ // console.log(sums[11].split(' '))
return sums
},
async getPeopleSalaryReportSearch() {
@@ -572,6 +625,7 @@
groupcode: this.form.groupcode,
compute: this.form.compute,
reportname: this.form.reportname,
+ rejectstepcode: this.form.rejectstepcode.join(','),
reportdate: tempDate,
prop: this.form.prop,
order: this.form.order,
@@ -581,7 +635,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 }
@@ -873,6 +932,20 @@
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