From a9fa58b552dbd8df7cadfccc0b66dbb125ce9f98 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 三月 2023 16:37:39 +0800
Subject: [PATCH] 1.节拍工价计件单价控制修改2.班组、人员报表红字添加
---
src/views/zzmx/jpgj.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 538c1c2..73c26bb 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 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,9 +715,10 @@
},
// 淇濆瓨琛�
async saveRow(row) {
- if (parseFloat(row.unprice) <= 0) {
+ if (parseFloat(row.unprice) <= 0 && this.eqpTable.steptype !== 'W') {
return this.$message.info('璁′欢鍗曚环蹇呴』澶т簬闆讹紒')
}
+
const data = {
partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
--
Gitblit v1.9.3