From 3f386968d4b5cbb002ad93483f86a5443159e18a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 08 二月 2025 09:54:32 +0800
Subject: [PATCH] 1.递交

---
 src/views/produce/reportCorrect.vue |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index 7df5531..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
@@ -320,8 +320,18 @@
           </div>
         </el-form-item>
         <el-form-item label="宸ュ簭鍗曚环" class="dialogFormItem">
-          <div style="width: 200px;">
-            {{ dialogForm.unprice ? dialogForm.unprice : '/' }}
+          <!--          <div style="width: 200px;">-->
+          <!--            {{ dialogForm.unprice ? dialogForm.unprice : '/' }}-->
+          <!--          </div>-->
+          <el-input
+            v-model="dialogForm.unprice"
+            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">
@@ -623,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

--
Gitblit v1.9.3