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 @@
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 @@
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 @@
+
+
+
+
+ {{ getAbnormalTime(scope.row) }}
+
+
@@ -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 @@
+
+
+
+
+
@@ -92,11 +97,6 @@
-
-
-
-
-
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 @@
异常信息
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 @@
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 @@
-
+
+ 暂未判级
@@ -64,7 +65,7 @@
+ :editable="false" :show-coil="false" :coil-info="abmornal.currentCoil" v-loading="abmornal.loading">
@@ -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 => {