From bc2e42b11021b58e9eb881fc240d49d61a84bf71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Tue, 5 May 2026 17:42:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=BC=82=E5=B8=B8=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=BC=82=E5=B8=B8=E8=A1=A8=E6=A0=BC=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加coil-info属性支持以显示异常挂载时机
新增创建人和创建时间列
调整主缺陷列位置
优化质量状态显示逻辑
---
 klp-ui/src/views/wms/coil/abnormalCoil.vue    |  2 +-
 klp-ui/src/views/wms/coil/abnormalDetail.vue  |  2 +-
 .../wms/coil/components/AbnormalTable.vue     | 27 +++++++++++++++++++
 .../wms/coil/components/ExceptionManager.vue  | 10 +++----
 klp-ui/src/views/wms/coil/info.vue            |  2 +-
 klp-ui/src/views/wms/coil/panels/abnormal.vue |  2 +-
 .../wms/report/components/coilTable/index.vue |  7 +++--
 7 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/abnormalCoil.vue b/klp-ui/src/views/wms/coil/abnormalCoil.vue
index ba06d96b..c9ab5826 100644
--- a/klp-ui/src/views/wms/coil/abnormalCoil.vue
+++ b/klp-ui/src/views/wms/coil/abnormalCoil.vue
@@ -51,7 +51,7 @@
         </el-form>
 
         <abnormal-table ref="abnormalTable" :list="coilAbnormalList" 
-          :editable="true" :show-coil="false" 
+          :editable="true" :show-coil="false" :coil-info="currentCoil"
           @delete="handleDelete" @update="handleUpdate">
         </abnormal-table>
 
diff --git a/klp-ui/src/views/wms/coil/abnormalDetail.vue b/klp-ui/src/views/wms/coil/abnormalDetail.vue
index a8b28af3..3975fe21 100644
--- a/klp-ui/src/views/wms/coil/abnormalDetail.vue
+++ b/klp-ui/src/views/wms/coil/abnormalDetail.vue
@@ -36,7 +36,7 @@
     </el-row>
 
     <abnormal-table ref="abnormalTable" :list="coilAbnormalList" 
-      :editable="true" :show-coil="false" 
+      :editable="true" :show-coil="false"
       @delete="handleDelete" @update="handleUpdate">
     </abnormal-table>
 
diff --git a/klp-ui/src/views/wms/coil/components/AbnormalTable.vue b/klp-ui/src/views/wms/coil/components/AbnormalTable.vue
index a674d38e..a9c45753 100644
--- a/klp-ui/src/views/wms/coil/components/AbnormalTable.vue
+++ b/klp-ui/src/views/wms/coil/components/AbnormalTable.vue
@@ -34,6 +34,13 @@
         <dict-tag :options="dict.type.coil_abnormal_degree" :value="scope.row.degree" />
       </template>
     </el-table-column>
+    <el-table-column label="创建人" align="center" prop="createBy" />
+    <el-table-column label="创建时间" align="center" prop="createTime" />
+    <el-table-column label="挂载时机" align="center" prop="abnormalTime" v-if="coilInfo.coilId">
+      <template slot-scope="scope">
+        {{ getAbnormalTime(scope.row) }}
+      </template>
+    </el-table-column>
 
     <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="editable">
       <template slot-scope="scope">
@@ -60,6 +67,10 @@ export default {
     showCoil: {
       type: Boolean,
       default: false
+    },
+    coilInfo: {
+      type: Object,
+      default: () => ({})
     }
   },
   components: {
@@ -76,6 +87,22 @@ export default {
       if (this.editable) {
         this.$emit('update', row);
       }
+    },
+    // 计算目标列的异常挂载时机
+    // 如果coilInfo.coilId存在，且与row.coilId相同，
+    // 判断钢卷的createBy和row.createBy是否相同
+    // 判断钢卷的createTime与row的createTime是否在一分钟内
+    // 如果是，返回'生产时'
+    // 如果否，返回'补录'
+    getAbnormalTime(row) {
+      if (this.coilInfo.coilId === row.coilId) {
+        if (this.coilInfo.createBy === row.createBy) {
+          if (Math.abs(new Date(this.coilInfo.createTime) - new Date(row.createTime)) < 60 * 1000) {
+            return '生产时'
+          }
+        }
+      }
+      return '补录'
     }
   }
 }
diff --git a/klp-ui/src/views/wms/coil/components/ExceptionManager.vue b/klp-ui/src/views/wms/coil/components/ExceptionManager.vue
index bbe56a62..29da9b03 100644
--- a/klp-ui/src/views/wms/coil/components/ExceptionManager.vue
+++ b/klp-ui/src/views/wms/coil/components/ExceptionManager.vue
@@ -82,6 +82,11 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="主缺陷" prop="mainMark" width="60">
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.mainMark" :true-label="1" :false-label="0"></el-checkbox>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button v-if="scope.row.abnormalId" type="text" size="mini" @click="handleDelete(scope.row)" style="color: #f56c6c;">
@@ -92,11 +97,6 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column label="主缺陷" prop="mainMark" width="60">
-          <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.mainMark" :true-label="1" :false-label="0"></el-checkbox>
-          </template>
-        </el-table-column>
       </el-table>
     </div>
   </div>
diff --git a/klp-ui/src/views/wms/coil/info.vue b/klp-ui/src/views/wms/coil/info.vue
index f9d05b6a..fda62694 100644
--- a/klp-ui/src/views/wms/coil/info.vue
+++ b/klp-ui/src/views/wms/coil/info.vue
@@ -725,7 +725,7 @@
           <span class="section-title">异常信息</span>
         </div>
         <div class="section-body">
-          <abnormal-table ref="abnormalTable" :list="abmornalList" :editable="false" :show-coil="false" />
+          <abnormal-table ref="abnormalTable" :list="abmornalList" :editable="false" :show-coil="false" :coil-info="coilInfo" />
         </div>
       </div>
 
diff --git a/klp-ui/src/views/wms/coil/panels/abnormal.vue b/klp-ui/src/views/wms/coil/panels/abnormal.vue
index de48d947..1d4ea243 100644
--- a/klp-ui/src/views/wms/coil/panels/abnormal.vue
+++ b/klp-ui/src/views/wms/coil/panels/abnormal.vue
@@ -27,7 +27,7 @@
     </el-form>
 
     <abnormal-table v-loading="loading" ref="abnormalTable" :list="coilAbnormalList" 
-      :editable="true" :show-coil="false" 
+      :editable="true" :show-coil="false" :coil-info="coilInfo"
       @delete="handleDelete" @update="handleUpdate">
     </abnormal-table>
 
diff --git a/klp-ui/src/views/wms/report/components/coilTable/index.vue b/klp-ui/src/views/wms/report/components/coilTable/index.vue
index c5fc78f3..569a1aff 100644
--- a/klp-ui/src/views/wms/report/components/coilTable/index.vue
+++ b/klp-ui/src/views/wms/report/components/coilTable/index.vue
@@ -51,7 +51,8 @@
           <!-- 质量状态，点击后会出现弹窗显示详细信息 -->
           <template v-else-if="column.prop === 'qualityStatus'">
             <div @click="handleQualityStatusClick(scope.row)" style="cursor: pointer; background-color: #f5f7fa;">
-              <dict-tag :options="dict.type.coil_quality_status" :value="scope.row.qualityStatus"></dict-tag>
+              <dict-tag v-if="scope.row.qualityStatus" :options="dict.type.coil_quality_status" :value="scope.row.qualityStatus"></dict-tag>
+              <span v-else>暂未判级</span>
             </div>
           </template>
           <!-- 默认渲染 -->
@@ -64,7 +65,7 @@
 
     <el-dialog title="钢卷异常信息" :visible.sync="abmornal.visible" width="60%">
       <abnormal-table ref="abnormalTable" :list="abmornal.data" 
-        :editable="false" :show-coil="false" v-loading="abmornal.loading">
+        :editable="false" :show-coil="false" :coil-info="abmornal.currentCoil" v-loading="abmornal.loading">
       </abnormal-table>
     </el-dialog>
   </div>
@@ -123,6 +124,7 @@ export default {
         visible: false,
         data: {},
         loading: false,
+        currentCoil: {},
       }
     }
   },
@@ -239,6 +241,7 @@ export default {
     handleQualityStatusClick(row) {
       this.abmornal.visible = true
       this.abmornal.loading = true
+      this.abmornal.currentCoil = row
       listCoilAbnormal({
         coilId: row.coilId
       }).then(response => {