From ff0604306c9cf18a05e5d8a3a136432284c290bb Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 23 五月 2023 09:15:04 +0800
Subject: [PATCH] 1.递交
---
src/views/bbgl/bzgz.vue | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 9ccca7a..56b65b5 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.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 class="topRight" style="display: flex;align-items: center">
+ <div
+ style="color: red;margin: 0px 10px 0 0;"
+ >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
+ </div>
+ <el-select
+ v-model="form.rejectstepcode"
+ style="width: 220px;"
+ multiple
+ placeholder="璇烽�夋嫨鍓旈櫎杞﹂棿"
+ collapse-tags
+ filterable
+ clearable
+ @change="getGroupSalaryReportSearch"
+ >
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
+
</div>
<div class="bodyTopFormGroup">
@@ -15,19 +41,19 @@
>
<div class="elForm">
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
- <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style="display: flex;">
- <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐢熶骇鐝粍" style=" display: flex;">
<el-select v-model="form.groupcode" style="width: 200px" placeholder="璇烽�夋嫨">
@@ -40,7 +66,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">
- <el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <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-date-picker
@@ -87,7 +113,6 @@
</div>
</div>
-
<el-tabs type="border-card" style="margin-top: 10px" @tab-click="tabClick">
<el-tab-pane label="鏈亾宸ュ簭">
<div class="elTableDiv" style="margin: 0 auto 10px;">
@@ -196,7 +221,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="璁颁欢宸ヨ祫"
+ label="璁′欢宸ヨ祫"
width="110"
sortable="custom"
>
@@ -360,7 +385,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="璁颁欢宸ヨ祫"
+ label="璁′欢宸ヨ祫"
width="110"
sortable="custom"
>
@@ -417,7 +442,6 @@
@pagination="getGroupSalaryReportSearch"
/>
</el-tab-pane>
-
</el-tabs>
</div>
@@ -462,7 +486,7 @@
/>
</div>
-</template>
+ </div></template>
<script>
import Pagination from '@/components/Pagination'
@@ -477,6 +501,8 @@
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { StepSelect } from '@/api/zzmx'
+import { WorkShopSelect } from '@/api/sbgl'
export default {
name: 'Zzjg',
@@ -490,6 +516,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
+ WorkShopArr: [], // 鍓旈櫎鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -499,6 +526,7 @@
groupcode: '', // 鐢熶骇鐝粍
username: '', // 鎿嶄綔浜哄憳
operdate: '', // 鎿嶄綔鏃堕棿
+ rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡 閫愰亾宸ュ簭锛歝ontin 鏈亾宸ュ簭锛歭ast
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -562,8 +590,18 @@
this.getGroupSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
+ this.getWorkShopSelect()
}
})
+ },
+ // 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
+ // async getStepSelect() {
+ // const { data: res } = await StepSelect()
+ // this.StepSelectArr = res
+ // },
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
getSummaries(param) {
const { columns, data } = param
@@ -579,9 +617,9 @@
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
- return prev + curr
+ return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
} else {
- return prev
+ return Math.round(prev * 100) / 100
}
}, 0)
sums[index] += ' 鍏�'
@@ -611,6 +649,7 @@
groupcode: this.form.groupcode,
username: this.form.username,
operdate: tempDate,
+ rejectstepcode: this.form.rejectstepcode.join(','),
compute: this.form.compute,
prop: this.form.prop,
order: this.form.order,
@@ -918,6 +957,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