From 193f9597e14415b55a54f3eea3e332c961d949b6 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 三月 2023 16:36:08 +0800
Subject: [PATCH] 1.节拍工价计件单价控制修改2.班组、人员报表红字添加
---
src/views/scgl/gd.vue | 2
src/views/bbgl/bzgz.vue | 60 ++++++++++++++++++--
src/views/zzmx/jpgj.vue | 16 +++--
src/views/bbgl/rygz.vue | 62 +++++++++++++++++++-
4 files changed, 124 insertions(+), 16 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 9ccca7a..1eca63f 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
+ style="color: red;margin: 10px 5px 0 0;"
+ >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
+ </div>
+
+ <!-- <div class="topRight" style="display: flex;align-items: center">-->
+ <!-- <el-select-->
+ <!-- v-model="form.rejectstepcode"-->
+ <!-- style="width: 170px;"-->
+ <!-- multiple-->
+ <!-- placeholder="璇烽�夋嫨鍓旈櫎宸ュ簭"-->
+ <!-- collapse-tags-->
+ <!-- filterable-->
+ <!-- clearable-->
+ <!-- @change="getGroupSalaryReportSearch"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in StepSelectArr"-->
+ <!-- :key="item.stepcode"-->
+ <!-- :label="item.stepname"-->
+ <!-- :value="item.stepcode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </div>-->
+
</div>
<div class="bodyTopFormGroup">
@@ -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;">
@@ -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,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',
@@ -490,6 +515,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
+ StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -499,6 +525,7 @@
groupcode: '', // 鐢熶骇鐝粍
username: '', // 鎿嶄綔浜哄憳
operdate: '', // 鎿嶄綔鏃堕棿
+ rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡 閫愰亾宸ュ簭锛歝ontin 鏈亾宸ュ簭锛歭ast
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -562,8 +589,14 @@
this.getGroupSalaryReportSearch().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
@@ -579,9 +612,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 +644,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 +952,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>
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 230199d..6ed1adb 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">
@@ -448,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',
@@ -461,6 +488,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
+ StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -470,6 +498,7 @@
groupcode: '', // 鐢熶骇鐝粍
reportname: '', // 鎿嶄綔浜哄憳
reportdate: '', // 鎿嶄綔鏃堕棿
+ rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡
prop: 'partcode', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -533,15 +562,21 @@
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 = []
columns.forEach((column, index) => {
- if (index === 10) {
+ if (index === 11) {
sums[index] = '鎬讳环'
return
}
@@ -550,9 +585,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)
@@ -567,7 +603,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() {
@@ -584,6 +623,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,
@@ -890,6 +930,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>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 854af65..c5d07bb 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -2066,6 +2066,8 @@
const { data: res2 } = await RouteSelectWkshop(data)
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
wkshopcodeChange(val) {
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index ac6f28c..7746c24 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -312,7 +312,7 @@
</el-form>
<div style="display: flex;flex-direction: column;margin-bottom: 20px">
<div>
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />宸ュ簭闆嗗悎
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0;" />宸ュ簭闆嗗悎
</div>
<div style="display: flex;background-color: #F2F6FC;padding:20px 0 20px 20px; min-height: 100px">
<el-radio-group v-model="dialogForm.stepcode" @change="radioChange">
@@ -355,15 +355,15 @@
/>
<el-table-column
prop="eqpcode"
- label="璁惧缂栫爜"
+ :label="eqpTable.steptype==='W'?'渚涘簲鍟嗙紪鐮�':'璁惧缂栫爜'"
sortable="custom"
show-tooltip-when-overflow
- min-width="110"
+ min-width="120"
/>
<el-table-column
prop="eqpname"
- label="璁惧鍚嶇О"
- min-width="110"
+ :label="eqpTable.steptype==='W'?'渚涘簲鍟嗗悕绉�':'璁惧鍚嶇О'"
+ min-width="120"
show-tooltip-when-overflow
sortable="custom"
/>
@@ -551,6 +551,7 @@
partcode: '',
routecode: '',
stepcode: '',
+ steptype: '',
page: 1,
rows: 10,
prop: 'eqpcode',
@@ -664,6 +665,7 @@
},
async routeDialogChange(val) {
const { data: res } = await RouteSelectStep({ routecode: val })
+ // this.stepDialogArr = res.filter(i => i.flag === 'Z')
this.stepDialogArr = res
this.eqpDialogArr = []
this.radioChangeTempValue = ''
@@ -689,11 +691,13 @@
},
async getEqpTable(val) {
if (typeof val === 'string') {
+ this.eqpTable.steptype = this.stepDialogArr.find(item => item.name === val).flag
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
// } else if (typeof val === 'number') {
} else {
+ this.eqpTable.steptype = this.stepDialogArr[0].flag
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr[0].code
@@ -711,7 +715,7 @@
},
// 淇濆瓨琛�
async saveRow(row) {
- if (parseFloat(row.unprice) <= 0) {
+ if (parseFloat(row.unprice) <= 0 && this.eqpTable.steptype !== 'W') {
return this.$message.info('璁′欢鍗曚环蹇呴』澶т簬闆讹紒')
}
--
Gitblit v1.9.3