fix: 修复/优化多个业务页面的逻辑与配置
1. 修正物料选项中的BX51D+Z为DX51D+Z 2. 给L2匹配面板的标准化方法添加日志与start_date/end_date字段解析 3. 优化卷材页面的日期赋值逻辑并添加调试日志 4. 简化异常表格的图片组件写法,新增继承来源列
This commit is contained in:
@@ -156,7 +156,7 @@ export default {
|
|||||||
],
|
],
|
||||||
materialOptions: [
|
materialOptions: [
|
||||||
{ label: 'SPCC', value: 'SPCC' },
|
{ label: 'SPCC', value: 'SPCC' },
|
||||||
{ label: 'BX51D+Z', value: 'BX51D+Z' },
|
{ label: 'DX51D+Z', value: 'DX51D+Z' },
|
||||||
{ label: 'DC01', value: 'DC01' },
|
{ label: 'DC01', value: 'DC01' },
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,12 +33,8 @@
|
|||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<template v-if="scope.row.attachmentFiles">
|
<template v-if="scope.row.attachmentFiles">
|
||||||
<div v-for="(url, idx) in scope.row.attachmentFiles.split(',')" :key="idx" style="margin-right: 4px;">
|
<div v-for="(url, idx) in scope.row.attachmentFiles.split(',')" :key="idx" style="margin-right: 4px;">
|
||||||
<el-image
|
<el-image style="width: 30px; height: 30px; vertical-align: middle; border-radius: 2px;" :src="url"
|
||||||
style="width: 30px; height: 30px; vertical-align: middle; border-radius: 2px;"
|
:preview-src-list="scope.row.attachmentFiles.split(',')" fit="cover" />
|
||||||
:src="url"
|
|
||||||
:preview-src-list="scope.row.attachmentFiles.split(',')"
|
|
||||||
fit="cover"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
@@ -50,6 +46,13 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="创建人" align="center" prop="createBy" />
|
<el-table-column label="创建人" align="center" prop="createBy" />
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" />
|
<el-table-column label="创建时间" align="center" prop="createTime" />
|
||||||
|
<el-table-column label="继承来源" prop="processSource" width="110">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-tag v-if="scope.row.processSource" type="warning" size="mini">
|
||||||
|
{{ scope.row.processSource }}
|
||||||
|
</el-tag>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="挂载时机" align="center" prop="abnormalTime" v-if="coilInfo.coilId">
|
<el-table-column label="挂载时机" align="center" prop="abnormalTime" v-if="coilInfo.coilId">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ getAbnormalTime(scope.row) }}
|
{{ getAbnormalTime(scope.row) }}
|
||||||
|
|||||||
@@ -142,6 +142,7 @@ export default {
|
|||||||
return val
|
return val
|
||||||
},
|
},
|
||||||
normalizeExcoilRow(row) {
|
normalizeExcoilRow(row) {
|
||||||
|
console.log(row, '标准化')
|
||||||
const g = k => row[k] != null ? row[k] : (row[k.toUpperCase()] != null ? row[k.toUpperCase()] : null)
|
const g = k => row[k] != null ? row[k] : (row[k.toUpperCase()] != null ? row[k.toUpperCase()] : null)
|
||||||
return {
|
return {
|
||||||
hot_coilid: g('hot_coilid'),
|
hot_coilid: g('hot_coilid'),
|
||||||
@@ -150,6 +151,8 @@ export default {
|
|||||||
exit_thick: g('exit_thick'),
|
exit_thick: g('exit_thick'),
|
||||||
exit_width: g('exit_width'),
|
exit_width: g('exit_width'),
|
||||||
exit_length: g('exit_length'),
|
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')
|
entry_weight: g('used_entry_weight') != null ? g('used_entry_weight')
|
||||||
: (g('meas_exit_weight') != null ? g('meas_exit_weight') : g('entry_weight')),
|
: (g('meas_exit_weight') != null ? g('meas_exit_weight') : g('entry_weight')),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -676,8 +676,15 @@ export default {
|
|||||||
if (data.exit_thick != null) this.$set(this.updateForm, 'actualThickness', parseFloat(data.exit_thick))
|
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.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))
|
console.log(data)
|
||||||
if (data.end_date) this.$set(this.updateForm, 'productionEndTime', this.formatDateTime(data.end_date))
|
|
||||||
|
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()
|
if (data.start_date || data.end_date) this.calculateProductionDuration()
|
||||||
|
|
||||||
const query = {
|
const query = {
|
||||||
|
|||||||
Reference in New Issue
Block a user