From c5a7bf1f2d6d1f5d0a8d4739dc28f579672160b3 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 08 三月 2023 16:07:51 +0800
Subject: [PATCH] 1.流转标签新增60*40尺寸
---
src/views/bbgl/rygz.vue | 539 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 392 insertions(+), 147 deletions(-)
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index cf10601..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">
@@ -86,146 +112,313 @@
</div>
</div>
- <div class="elTableDiv">
- <el-table
- ref="tableDataRef"
- class="tableFixed"
- :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
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="sortChange"
- >
- <el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="wo_code"
- label="宸ュ崟缂栧彿"
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="partcode"
- label="浜у搧缂栫爜"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="stepcode"
- label="宸ュ簭缂栫爜"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="stepname"
- label="宸ュ簭鍚嶇О"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="task_qty"
- label="浠诲姟鏁伴噺"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="group_name"
- label="鐢熶骇鐝粍"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="report_qty"
- label="鎶ュ伐鏁伴噺"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.report_qty">{{ row.report_qty }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="unprice"
- label="宸ュ簭鍗曚环"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="usermoney"
- label="涓汉璁颁欢宸ヨ祫"
- width="130"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="username"
- label="鎶ュ伐浜哄憳"
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="report_date"
- label="鎶ュ伐鏃堕棿"
- width="160"
- sortable="custom"
- />
+ <el-tabs type="border-card" style="margin-top: 10px" @tab-click="tabClick">
+ <el-tab-pane label="鏈亾宸ュ簭">
+ <div class="elTableDiv" style="margin: 0 auto 10px;">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
+ border
+ :summary-method="getSummaries"
+ show-summary
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栧彿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="stepcode"
+ label="宸ュ簭缂栫爜"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭鍚嶇О"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="task_qty"
+ label="浠诲姟鏁伴噺"
+ width="110"
+ 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="report_qty"
+ label="鎶ュ伐鏁伴噺"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.report_qty">{{ row.report_qty }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unprice"
+ label="宸ュ簭鍗曚环"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.unprice">{{ row.unprice }} 鍏�</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"
+ label="涓汉璁′欢宸ヨ祫"
+ width="130"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="username"
+ label="鎶ュ伐浜哄憳"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="report_date"
+ label="鎶ュ伐鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
- </el-table>
- </div>
- <!--鍒嗛〉-->
- <pagination
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="total,prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getPeopleSalaryReportSearch"
- />
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getPeopleSalaryReportSearch"
+ />
+ </el-tab-pane>
+ <el-tab-pane label="閫愰亾宸ュ簭">
+ <div class="elTableDiv" style="margin: 0 auto 10px;">
+ <el-table
+ ref="tableDataRef2"
+ class="tableFixed"
+ :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-80):(tableHeight-40)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栧彿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="stepcode"
+ label="宸ュ簭缂栫爜"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭鍚嶇О"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="task_qty"
+ label="浠诲姟鏁伴噺"
+ width="110"
+ 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="report_qty"
+ label="鎶ュ伐鏁伴噺"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.report_qty">{{ row.report_qty }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unprice"
+ label="宸ュ簭鍗曚环"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="usermoney"
+ label="涓汉璁′欢宸ヨ祫"
+ width="130"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="username"
+ label="鎶ュ伐浜哄憳"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="report_date"
+ label="鎶ュ伐鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getPeopleSalaryReportSearch"
+ />
+ </el-tab-pane>
+ </el-tabs>
</div>
<el-dialog
@@ -281,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',
@@ -294,6 +488,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
+ StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -303,6 +498,8 @@
groupcode: '', // 鐢熶骇鐝粍
reportname: '', // 鎿嶄綔浜哄憳
reportdate: '', // 鎿嶄綔鏃堕棿
+ rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
+ compute: 'last', // 璁′欢鏂瑰紡
prop: 'partcode', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -311,6 +508,7 @@
groupArr: [],
total: 10,
tableData: [],
+ tableData2: [],
dialogVisible: false,
tagArr: [], //
dialogForm: {
@@ -346,6 +544,12 @@
}
}
},
+ // updated() {
+ // this.$nextTick(() => {
+ // this.$refs.tableDataRef.doLayout()
+ // this.$refs.tableDataRef2.doLayout()
+ // })
+ // },
created() {
this.handleRequest()
},
@@ -358,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
}
@@ -375,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)
@@ -390,8 +603,12 @@
this.$nextTick(() => {
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() {
@@ -406,7 +623,9 @@
partspec: this.form.partspec,
stepname: this.form.stepname,
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,
@@ -416,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 }
@@ -425,6 +649,10 @@
async getMesOrderStepReportSelectUserGroup() {
const { data: res } = await MesOrderStepReportSelectUserGroup()
this.groupArr = res
+ },
+ tabClick(val) {
+ this.form.compute = val.label === '鏈亾宸ュ簭' ? 'last' : 'contin'
+ this.getPeopleSalaryReportSearch()
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -452,6 +680,7 @@
partspec: this.form.partspec,
stepname: this.form.stepname,
groupcode: this.form.groupcode,
+ compute: this.form.compute,
reportname: this.form.reportname,
reportdate: tempDate
}
@@ -563,6 +792,7 @@
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 255
this.$refs.tableDataRef.doLayout()
+ this.$refs.tableDataRef2.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -693,14 +923,29 @@
justify-content: center;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
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