From c888fc2cc457ca646e10df2575e5cc9e91abd5d3 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 30 八月 2024 10:53:31 +0800
Subject: [PATCH] 1.递交
---
src/views/produce/reportCorrect.vue | 12 +++++++++---
src/views/produce/reportVerify.vue | 6 +++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index 906eb7c..fd07655 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -186,13 +186,13 @@
</el-table-column>
<el-table-column
prop="wx_name"
- label="渚涘簲鍟�"
+ label="璁惧/渚涘簲鍟�"
show-overflow-tooltip
sortable="custom"
- min-width="110"
+ min-width="125"
>
<template slot-scope="{row}">
- {{ row.wx_name ? row.wx_name : '/' }}
+ {{ row.steptype === 'Z' ?(row.eqp_name?row.eqp_name:'/'): row.wx_name }}
</template>
</el-table-column>
<el-table-column
@@ -328,6 +328,11 @@
oninput="value=value.replace(/[^0-9.]/g,'')"
style="width: 200px"
/>
+ </el-form-item>
+ <el-form-item v-if="dialogForm.flw_type==='Z'" label="璁惧" class="dialogFormItem">
+ <div style="width: 200px;" class="ellipsis">
+ {{ dialogForm.eqp_name ? dialogForm.eqp_name : '/' }}
+ </div>
</el-form-item>
<el-form-item v-if="dialogForm.flw_type==='Z'" label="鎶ュ伐鐝粍" class="dialogFormItem">
<div style="width: 200px;" class="ellipsis">
@@ -628,6 +633,7 @@
this.dialogForm.task_qty = row.task_qty
this.dialogForm.wkshp_code = row.wkshp_code
this.dialogForm.eqp_code = row.eqp_code
+ this.dialogForm.eqp_name = row.eqp_name
this.dialogForm.step_seq = row.step_seq
this.dialogForm.step_code = row.step_code
this.dialogForm.step_name = row.stepname
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 20a414d..e402372 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -225,13 +225,13 @@
</el-table-column>
<el-table-column
prop="wx_name"
- label="渚涘簲鍟�"
+ label="璁惧/渚涘簲鍟�"
show-overflow-tooltip
sortable="custom"
- min-width="110"
+ min-width="125"
>
<template slot-scope="{row}">
- {{ row.wx_name ? row.wx_name : '/' }}
+ {{ row.steptype === 'Z' ?(row.eqp_name?row.eqp_name:'/'): row.wx_name }}
</template>
</el-table-column>
<el-table-column
--
Gitblit v1.9.3