From e219477893c5e25319370a8497ef05bb3887b677 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 27 Mar 2026 15:18:49 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-27=20IQC=E6=A3=80=E9=AA=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BC=BA=E9=99=B7=E8=B7=9F=E8=B8=AA=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=20=E7=89=A9=E6=96=99=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E3=80=8B=E7=BC=BA=E9=99=B7=E8=B7=9F=E8=B8=AA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/IQCResultEntry.vue  | 31 +++++++++++++---
 src/views/modules/qc/qcPartAttribute.vue | 46 ++++++++++++------------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 5c4cc22..1a8edd0 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -280,6 +280,18 @@
       @row-click="IQCClickRow"
       @selection-change="selectionIQC"
       style="width: 100%;">
+      <el-table-column
+        prop="defectTrackingFlag"
+        header-align="center"
+        align="center"
+        width="32"
+        label=" "
+        class-name="defect-flag-column"
+        label-class-name="defect-flag-header">
+        <template slot-scope="scope">
+          <svg v-if="scope.row.defectTrackingFlag && scope.row.defectTrackingFlag.trim().toUpperCase() === 'Y'" t="1774593315836" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3431" id="mx_n_1774593315837" width="22" height="22"><path d="M765.4 331.5c-23.4-33.1-23.4-38 0-71.1l85.2-105.2c16-22.5-0.2-53.7-27.8-53.7H337.2c-21.7 0-39.4 17.6-39.4 39.4V810c0 21.7 17.6 39.4 39.4 39.4 21.7 0 39.4-17.6 39.4-39.4V490.3h446.3c27.6 0 43.7-31.2 27.8-53.7l-85.3-105.1z" fill="#d92e71" p-id="3432" data-spm-anchor-id="a313x.search_index.0.i13.5c113a810rcz2v" class=""></path><path d="M70.5 840.3a260.2 92.9 0 1 0 520.4 0 260.2 92.9 0 1 0-520.4 0Z" fill="#d92e71" opacity=".2" p-id="3433"></path></svg>
+        </template>
+      </el-table-column>
       <el-table-column
         type="selection"
         header-align="center"
@@ -1170,6 +1182,7 @@
       exportFields () {
         let fields = {}
         // 添加固定的状态列
+        fields['异常'] = 'defectTrackingFlag'
         fields['状态'] = 'state'
         // 添加动态列
         this.columnList1.forEach(item => {
@@ -4484,11 +4497,21 @@
 }
 
 .info-item label {
+  color: #909399;
+  font-size: 13px;
+  line-height: 1.5;
+  margin-bottom: 4px;
   display: block;
-  margin-bottom: 6px;
-  font-size: 12px;
-  font-weight: 500;
-  color: #606266;
+}
+
+/* 红旗列样式 */
+.el-table /deep/ th.defect-flag-header {
+  background-color: #ffffff !important;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.el-table /deep/ td.defect-flag-column {
+  background-color: #ffffff !important;
 }
 
 .info-item label a {
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index e903d1e..29c7815 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -657,15 +657,7 @@
             min-width="100"
             label="当前不合格次数">
             <template slot-scope="scope">
-              <span v-if="editBatchVisible">
-                <el-input :controls="false" v-model="scope.row.currentDefectCount"
-                          @input="value=>scope.row.currentDefectCount = value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
-                          style="height: 11px; width: 98%;">
-                </el-input>
-              </span>
-              <span v-else>
-                <span>{{scope.row[scope.column.property]}}</span>
-              </span>
+              <span>{{scope.row[scope.column.property]}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -675,15 +667,27 @@
             min-width="100"
             label="上次不合格次数">
             <template slot-scope="scope">
-              <span v-if="editBatchVisible">
-                <el-input :controls="false" v-model="scope.row.lastDefectCount"
-                          @input="value=>scope.row.lastDefectCount = value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
-                          style="height: 11px; width: 98%;">
-                </el-input>
-              </span>
-              <span v-else>
-                <span>{{scope.row[scope.column.property]}}</span>
-              </span>
+              <span>{{scope.row[scope.column.property]}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="remainingTrackingBatches"
+            header-align="center"
+            align="center"
+            min-width="100"
+            label="剩余跟踪批次">
+            <template slot-scope="scope">
+              <span>{{scope.row.remainingTrackingBatches}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="lastTriggerTime"
+            header-align="center"
+            align="center"
+            min-width="140"
+            label="最近触发时间">
+            <template slot-scope="scope">
+              <span>{{scope.row.lastTriggerTime}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -1242,12 +1246,6 @@
         <el-form-item label="连续合格批次数量">
           <el-input-number :controls="false" :step="0" v-model="defectTrackingData.recoveryBatchCount" style="width: 100px"></el-input-number>
         </el-form-item>
-        <el-form-item label="当前不合格次数">
-          <el-input-number :controls="false" :step="0" v-model="defectTrackingData.currentDefectCount" style="width: 100px"></el-input-number>
-        </el-form-item>
-        <el-form-item label="上次不合格次数">
-          <el-input-number :controls="false" :step="0" v-model="defectTrackingData.lastDefectCount" style="width: 100px"></el-input-number>
-        </el-form-item>
       </el-form>
       <el-footer style="height:35px;margin-top: 15px;text-align:center">
         <el-button type="primary" @click="saveDefectTracking()">保存</el-button>