From 12ef895481038a7bec06a2c6cb47748a6353e848 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:35:04 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/views/zzmx/jpgj.vue | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 2137b81..fc1bd8c 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -16,7 +16,7 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label-width="70px" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label="浜у搧鍚嶇О/缂栫爜" style=" display: flex;">
<el-select
v-model="form.partcode"
filterable
@@ -30,7 +30,7 @@
<el-option
v-for="item in partArr"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partname+' / ' + item.partcode"
:value="item.partcode"
/>
</el-select>
@@ -124,14 +124,15 @@
/>
<el-table-column
prop="partcode"
- min-width="160"
+ min-width="120"
label="浜у搧缂栫爜"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- min-width="160"
+ min-width="200"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -262,7 +263,7 @@
<el-option
v-for="item in partArr2"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partname + ' / '+ item.partcode"
:value="item.partcode"
/>
</el-select>
@@ -304,11 +305,13 @@
<div>
<i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />宸ュ簭闆嗗悎
</div>
- <div style="display: flex;background-color: #F2F6FC;padding:20px 0 20px 20px; min-height: 100px">
+
+ <div style="display: flex;background-color: #F2F6FC;padding:10px; min-height: 100px">
<el-radio-group v-model="dialogForm.stepcode" @change="radioChange">
<el-radio
- v-for="item in stepDialogArr"
+ v-for="(item,index) in stepDialogArr"
:key="item.code"
+ :style="{marginLeft:index%7===0?0:'10px',marginBottom:'10px'}"
:label="item.name"
border
/>
@@ -431,10 +434,10 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-show="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
- <el-button v-show="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
- <el-button v-show="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
- <el-button v-show="row.isVisible===0" type="text" @click="copyRow(row)">澶嶅埗</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible===0" type="text" @click="copyRow(row)">澶嶅埗</el-button>
</div>
</template>
</el-table-column>
@@ -616,17 +619,20 @@
this.form.routecode = ''
this.form.stepcode = ''
this.form.eqpcode = ''
+ this.search()
},
async routeChange(val) {
const { data: res } = await RouteSelectStep({ routecode: val })
this.stepArr = res
this.form.stepcode = ''
this.form.eqpcode = ''
+ this.search()
},
async stepChange(val) {
const { data: res } = await StepSelectEqp({ stepcode: val })
this.eqpArr = res
this.form.eqpcode = ''
+ this.search()
},
// 閲嶇疆
reset() {
@@ -694,6 +700,9 @@
},
// 淇濆瓨琛�
async saveRow(row) {
+ if (parseFloat(row.unprice) <= 0 && this.eqpTable.steptype !== 'W') {
+ return this.$message.info('璁′欢鍗曚环蹇呴』澶т簬闆讹紒')
+ }
const data = {
partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
@@ -717,6 +726,8 @@
// 鍙栨秷琛�
cancelRow(row) {
this.getEqpTable()
+ this.radioChange(this.radioChangeTempValue)
+ this.dialogForm.stepcode = this.radioChangeTempValue
this.isEqpTableEdit = true
},
// 缂栬緫琛�
--
Gitblit v1.9.3