From 96fd4864d4beb421fbedc67b02393735b0942229 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 26 6月 2024 09:57:14 +0800
Subject: [PATCH] 2

---
 iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue b/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
index d2df25c..fdf1bd0 100644
--- a/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
+++ b/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
@@ -83,6 +83,14 @@
       dataIndex: 'qualityOP10To1'
     }
   ],
+  EOP40: [
+    {
+      title: '杩炴潌鍘氬害',
+      align: 'center',
+      sorter: true,
+      dataIndex: 'qualityOP40To1'
+    }
+  ],
   EOP20: [
     {
       title: '灏忓ご瀛旂洿寰�',
@@ -181,7 +189,7 @@
       dataIndex: 'qualityOP60To1'
     },
     {
-      title: '鏍¢獙鐮佺粨鏋�',
+      title: '灏忓ご瀛旂洿寰�',
       align: 'center',
       sorter: true,
       dataIndex: 'qualityOP60To2'
@@ -1485,8 +1493,9 @@
         } else {
           this.getQualityInfoForID()
           for (var key in this.qualityDataAll) {
-            if (record.equipmentID == 'EOP40') {
-              this.qualityDataCurrent = this.qualityDataAll.EOP10
+            if (record.equipmentID == 'EOP10' && record.workingProcedureCurrent=='OP40') {
+              debugger
+              this.qualityDataCurrent = this.qualityDataAll.EOP40
               break
             } else {
               if (key == record.equipmentID) {

--
Gitblit v1.9.3