diff --git a/klp-ui/src/views/crm/contract/components/ProductContent.vue b/klp-ui/src/views/crm/contract/components/ProductContent.vue
index 592248d9..ef981297 100644
--- a/klp-ui/src/views/crm/contract/components/ProductContent.vue
+++ b/klp-ui/src/views/crm/contract/components/ProductContent.vue
@@ -156,7 +156,7 @@ export default {
],
materialOptions: [
{ label: 'SPCC', value: 'SPCC' },
- { label: 'BX51D+Z', value: 'BX51D+Z' },
+ { label: 'DX51D+Z', value: 'DX51D+Z' },
{ label: 'DC01', value: 'DC01' },
]
}
diff --git a/klp-ui/src/views/wms/coil/components/AbnormalTable.vue b/klp-ui/src/views/wms/coil/components/AbnormalTable.vue
index 66cc092a..dba78f74 100644
--- a/klp-ui/src/views/wms/coil/components/AbnormalTable.vue
+++ b/klp-ui/src/views/wms/coil/components/AbnormalTable.vue
@@ -33,12 +33,8 @@
-
+
@@ -50,6 +46,13 @@
+
+
+
+ {{ scope.row.processSource }}
+
+
+
{{ getAbnormalTime(scope.row) }}
diff --git a/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue b/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue
index 74e09fea..c331a6bb 100644
--- a/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue
+++ b/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue
@@ -142,6 +142,7 @@ export default {
return val
},
normalizeExcoilRow(row) {
+ console.log(row, '标准化')
const g = k => row[k] != null ? row[k] : (row[k.toUpperCase()] != null ? row[k.toUpperCase()] : null)
return {
hot_coilid: g('hot_coilid'),
@@ -150,6 +151,8 @@ export default {
exit_thick: g('exit_thick'),
exit_width: g('exit_width'),
exit_length: g('exit_length'),
+ start_date: g('start_date'),
+ end_date: g('end_date'),
entry_weight: g('used_entry_weight') != null ? g('used_entry_weight')
: (g('meas_exit_weight') != null ? g('meas_exit_weight') : g('entry_weight')),
}
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 8c1ae2cc..79bed42d 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -676,8 +676,15 @@ export default {
if (data.exit_thick != null) this.$set(this.updateForm, 'actualThickness', parseFloat(data.exit_thick))
if (data.exit_width != null) this.$set(this.updateForm, 'actualWidth', parseFloat(data.exit_width))
- if (data.start_date) this.$set(this.updateForm, 'productionStartTime', this.formatDateTime(data.start_date))
- if (data.end_date) this.$set(this.updateForm, 'productionEndTime', this.formatDateTime(data.end_date))
+ console.log(data)
+
+ if (data.start_date) {
+ this.$set(this.updateForm, 'productionStartTime', this.formatDateTime(data.start_date))
+ }
+
+ if (data.end_date) {
+ this.$set(this.updateForm, 'productionEndTime', this.formatDateTime(data.end_date))
+ }
if (data.start_date || data.end_date) this.calculateProductionDuration()
const query = {