From 7d540071e539dda17f0e11859958167d0c1a7615 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 30 十一月 2022 15:55:54 +0800
Subject: [PATCH] 1.看板优化
---
src/views/bbgl/bzgz.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 75d3358..d34a844 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">
@@ -200,7 +220,8 @@
label="鎶ュ伐浜哄憳"
width="110"
sortable="custom"
- /> <el-table-column
+ />
+ <el-table-column
prop="report_date"
label="鎶ュ伐鏃堕棿"
width="160"
@@ -294,6 +315,7 @@
GroupSalaryReportSearchUser
} from '@/api/bbgl'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
+import { StepSelect } from '@/api/zzmx'
export default {
name: 'Zzjg',
@@ -306,6 +328,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
+ StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -315,6 +338,7 @@
groupcode: '', // 鐢熶骇鐝粍
username: '', // 鎿嶄綔浜哄憳
operdate: '', // 鎿嶄綔鏃堕棿
+ rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -324,7 +348,7 @@
total: 10,
tableData: [],
dialogVisible: false,
- tagArr: [], //
+ tagArr: [],
dialogForm: {
OrgType: '',
OrgCode: '',
@@ -370,8 +394,18 @@
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
@@ -418,6 +452,7 @@
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,
@@ -711,6 +746,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