diff --git a/klp-ui/src/components/KLPService/Renderer/CoilCard.vue b/klp-ui/src/components/KLPService/Renderer/CoilCard.vue index 8ae54265..303f673b 100644 --- a/klp-ui/src/components/KLPService/Renderer/CoilCard.vue +++ b/klp-ui/src/components/KLPService/Renderer/CoilCard.vue @@ -65,11 +65,11 @@
长度： - {{ coil.length }}米 + {{ coil.length }}m
实测长度： - {{ coil.actualLength }}mm + {{ coil.actualLength }}m
实测厚度： diff --git a/klp-ui/src/components/KLPService/Renderer/CoilNo.vue b/klp-ui/src/components/KLPService/Renderer/CoilNo.vue index 8d597111..28cae80a 100644 --- a/klp-ui/src/components/KLPService/Renderer/CoilNo.vue +++ b/klp-ui/src/components/KLPService/Renderer/CoilNo.vue @@ -32,11 +32,11 @@
长度： - {{ length }} + {{ length }}m
实测长度： - {{ actualLength }}mm + {{ actualLength }}m
实测厚度： diff --git a/klp-ui/src/main.js b/klp-ui/src/main.js index c44635d5..0771fd66 100644 --- a/klp-ui/src/main.js +++ b/klp-ui/src/main.js @@ -49,6 +49,7 @@ import MemoInput from '@/components/MemoInput/index.vue' import MutiSelect from '@/components/MutiSelect/index.vue' import CurrentCoilNo from '@/components/KLPService/Renderer/CurrentCoilNo.vue' import DictSelect from '@/components/DictSelect' +import CoilInfo from '@/views/wms/coil/components/CoilInfo.vue' // 初始化所有列 import { initAllColumns } from '@/views/wms/report/js/column.js' @@ -86,6 +87,7 @@ Vue.component('MutiSelect', MutiSelect) Vue.component('DictSelect', DictSelect) Vue.component('CurrentCoilNo', CurrentCoilNo) +Vue.component('CoilInfoRender', CoilInfo) Vue.use(vueFlvPlayer) Vue.use(directive) diff --git a/klp-ui/src/views/aps/sheets/templates.js b/klp-ui/src/views/aps/sheets/templates.js index 1c814ee9..fcbd7397 100644 --- a/klp-ui/src/views/aps/sheets/templates.js +++ b/klp-ui/src/views/aps/sheets/templates.js @@ -34,7 +34,7 @@ export const APS_SHEET_TEMPLATES = [ { label: '成品宽度', prop: 'productWidth', width: 100, align: 'right' }, { label: '扎制厚度', prop: 'rollingThick', width: 100, align: 'right' }, { label: '标丝厚度', prop: 'markCoatThick', width: 100, align: 'right' }, - { label: '吨钢长度区间m', prop: 'tonSteelLengthRange', minWidth: 130 }, + { label: '吨钢长度区间(m)', prop: 'tonSteelLengthRange', minWidth: 130 }, { label: '数量', prop: 'planQty', width: 90, align: 'right' }, { label: '重量', prop: 'planWeight', width: 100, align: 'right' }, { label: '表面处理', prop: 'surfaceTreatment', width: 110 }, diff --git a/klp-ui/src/views/crm/components/CoilTable.vue b/klp-ui/src/views/crm/components/CoilTable.vue index 2b1b13c5..0e2424b4 100644 --- a/klp-ui/src/views/crm/components/CoilTable.vue +++ b/klp-ui/src/views/crm/components/CoilTable.vue @@ -126,8 +126,9 @@ export default { { label: '厂家', prop: 'itemManufacturer' }, { label: '调制度', prop: 'temperGrade' }, { label: '镀层种类', prop: 'coatingType' }, - { label: '实测长度(mm)', prop: 'actualLength' }, + { label: '实测长度(m)', prop: 'actualLength' }, { label: '实测宽度(mm)', prop: 'actualWidth' }, + { label: '实测厚度(mm)', prop: 'actualThickness' }, ], title: '详细信息' }, diff --git a/klp-ui/src/views/lines/panels/analysis/components/pdo.vue b/klp-ui/src/views/lines/panels/analysis/components/pdo.vue index 23664a1b..216c84a6 100644 --- a/klp-ui/src/views/lines/panels/analysis/components/pdo.vue +++ b/klp-ui/src/views/lines/panels/analysis/components/pdo.vue @@ -29,7 +29,7 @@ export default { { label: '成品卷数', value: res.coilCount }, // coilCount=总卷数，结合“成品总重/原料总重”场景，推测为成品卷数 { label: '平均出口厚度[mm]', value: res.avgExitThickness }, // avgExitThickness=平均出口厚度，厚度用“平均”更符合实际（单卷厚度均匀，无“总厚度”概念） { label: '原料总重[t]', value: res.totalEntryWeight }, // totalEntryWeight=总入口重量，入口重量即原料重量 - { label: '总出口长度[mm]', value: res.totalExitLength }, // totalExitLength=总出口长度，补充原“去锌总重”（无对应字段）的空缺，符合卷材加工的核心维度 + { label: '总出口长度[m]', value: res.totalExitLength }, // totalExitLength=总出口长度，补充原“去锌总重”（无对应字段）的空缺，符合卷材加工的核心维度 { label: '平均出口宽度[mm]', value: res.avgExitWidth }, // avgExitWidth=平均出口宽度，宽度用“平均”更合理（单卷宽度固定，“总宽度”无业务意义） { label: '成品总重[t]', value: res.totalActualWeight }, // totalActualWeight=总实际重量，实际重量即成品最终重量 { label: '总理论重量[t]', value: res.totalTheoryWeight }, // totalTheoryWeight=总理论重量，工业场景中常用“理论重量vs实际重量”对比 diff --git a/klp-ui/src/views/lines/panels/analysis/pdo.vue b/klp-ui/src/views/lines/panels/analysis/pdo.vue index 3917d37c..9b1dc610 100644 --- a/klp-ui/src/views/lines/panels/analysis/pdo.vue +++ b/klp-ui/src/views/lines/panels/analysis/pdo.vue @@ -62,7 +62,7 @@ export default { { label: '成品卷数', value: res.coilCount }, // coilCount=总卷数，结合“成品总重/原料总重”场景，推测为成品卷数 { label: '平均出口厚度[mm]', value: res.avgExitThickness }, // avgExitThickness=平均出口厚度，厚度用“平均”更符合实际（单卷厚度均匀，无“总厚度”概念） { label: '原料总重[t]', value: res.totalEntryWeight }, // totalEntryWeight=总入口重量，入口重量即原料重量 - { label: '总出口长度[mm]', value: res.totalExitLength }, // totalExitLength=总出口长度，补充原“去锌总重”（无对应字段）的空缺，符合卷材加工的核心维度 + { label: '总出口长度[m]', value: res.totalExitLength }, // totalExitLength=总出口长度，补充原“去锌总重”（无对应字段）的空缺，符合卷材加工的核心维度 { label: '平均出口宽度[mm]', value: res.avgExitWidth }, // avgExitWidth=平均出口宽度，宽度用“平均”更合理（单卷宽度固定，“总宽度”无业务意义） { label: '成品总重[t]', value: res.totalActualWeight }, // totalActualWeight=总实际重量，实际重量即成品最终重量 { label: '总理论重量[t]', value: res.totalTheoryWeight }, // totalTheoryWeight=总理论重量，工业场景中常用“理论重量vs实际重量”对比 diff --git a/klp-ui/src/views/lines/panels/plan/index.vue b/klp-ui/src/views/lines/panels/plan/index.vue index 79ee3be2..2e17eeb9 100644 --- a/klp-ui/src/views/lines/panels/plan/index.vue +++ b/klp-ui/src/views/lines/panels/plan/index.vue @@ -11,7 +11,7 @@ - + @@ -49,7 +49,7 @@ {{ currentRow.entryWidth }} - + {{ currentRow.entryLength }} @@ -117,7 +117,7 @@ - + diff --git a/klp-ui/src/views/lines/panels/track/index.vue b/klp-ui/src/views/lines/panels/track/index.vue index 3d374ea2..5fb82935 100644 --- a/klp-ui/src/views/lines/panels/track/index.vue +++ b/klp-ui/src/views/lines/panels/track/index.vue @@ -242,7 +242,7 @@ {{ selectedPlan.entryWeight ? selectedPlan.entryWeight + ' t' : '-' }} - {{ selectedPlan.entryLength ? selectedPlan.entryLength + ' mm' : '-' }} + {{ selectedPlan.entryLength ? selectedPlan.entryLength + ' m' : '-' }} {{ selectedPlan.orderNo || '-' }} {{ selectedPlan.unitCode || '-' }} diff --git a/klp-ui/src/views/wms/coil/components/CoilInfo.vue b/klp-ui/src/views/wms/coil/components/CoilInfo.vue index 3f78fb7f..6addfe20 100644 --- a/klp-ui/src/views/wms/coil/components/CoilInfo.vue +++ b/klp-ui/src/views/wms/coil/components/CoilInfo.vue @@ -1,44 +1,22 @@ @@ -54,22 +32,62 @@ export default { type: Number, default: 5 }, - // 只显示有值的字段 + border: { + type: Boolean, + default: false + }, + // 只显示有值的字段 showOnlyValue: { type: Boolean, default: false } }, - methods: { - getStatusClass(status) { - if (!status) return '' - const statusLower = status.toLowerCase() - if (statusLower.includes('合格')) return 'status-success' - if (statusLower.includes('不合格')) return 'status-danger' - if (statusLower.includes('待检')) return 'status-warning' - return '' + computed: { + fields() { + return [ + { label: '入场卷号', key: 'enterCoilNo' }, + { label: '当前卷号', key: 'currentCoilNo' }, + { label: '厂家原料号', key: 'supplierCoilNo' }, + { label: '逻辑库位', key: 'warehouseName' }, + { label: '实际库区', key: 'actualWarehouseName' }, + { label: '班组', key: 'team' }, + { label: '材料类型', key: 'materialType' }, + { label: '物料名', key: 'itemName' }, + { label: '规格', key: 'specification' }, + { label: '材质', key: 'material' }, + { label: '厂家', key: 'manufacturer' }, + { label: '镀层质量', key: 'zincLayer' }, + { label: '表面处理', key: 'surfaceTreatmentDesc' }, + { label: '质量状态', key: 'qualityStatus' }, + { label: '切边要求', key: 'trimmingRequirement' }, + { label: '原料材质', key: 'packingStatus' }, + { label: '包装要求', key: 'packagingRequirement' }, + { label: '实测厚度[mm]', key: 'actualThickness' }, + { label: '实测宽度[mm]', key: 'actualWidth' }, + { label: '长度[m]', key: 'length' }, + { label: '毛重[t]', key: 'grossWeight' }, + { label: '净重[t]', key: 'netWeight' }, + { label: '生产开始', key: 'productionStartTime' }, + { label: '生产结束', key: 'productionEndTime' }, + { label: '调制度', key: 'temperGrade' }, + { label: '镀层种类', key: 'coatingType' }, + { label: '钢卷表面处理', key: 'coilSurfaceTreatment' }, + { label: '备注', key: 'remark', span: this.column > 2 ? this.column - 2 : 1 } + ] + }, + filteredFields() { + let fields = this.fields.map(item => ({ + ...item, + value: this.coilInfo[item.key] + })) + + if (this.showOnlyValue) { + fields = fields.filter(item => item.value !== undefined && item.value !== null && item.value !== '') + } + + return fields } - } + }, } diff --git a/klp-ui/src/views/wms/coil/do/correntAll.vue b/klp-ui/src/views/wms/coil/do/correntAll.vue index 22f743f5..424cd708 100644 --- a/klp-ui/src/views/wms/coil/do/correntAll.vue +++ b/klp-ui/src/views/wms/coil/do/correntAll.vue @@ -340,10 +340,10 @@ - + - + @@ -493,7 +493,7 @@ export default { { label: '厂家', prop: 'manufacturer' }, { label: '调制度', prop: 'temperGrade' }, { label: '镀层种类', prop: 'coatingType' }, - { label: '实测长度(mm)', prop: 'actualLength' }, + { label: '实测长度(m)', prop: 'actualLength' }, { label: '实测宽度(mm)', prop: 'actualWidth' }, { label: '实测厚度(mm)', prop: 'actualThickness' }, { label: '钢卷表面处理', prop: 'coilSurfaceTreatment' }, diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue index 8f4900f3..0ce5ea1f 100644 --- a/klp-ui/src/views/wms/coil/do/search.vue +++ b/klp-ui/src/views/wms/coil/do/search.vue @@ -194,7 +194,7 @@
长度： - {{ item.length }}mm + {{ item.length }}m
调制度： diff --git a/klp-ui/src/views/wms/coil/info.vue b/klp-ui/src/views/wms/coil/info.vue index 0e9c69be..17fa4101 100644 --- a/klp-ui/src/views/wms/coil/info.vue +++ b/klp-ui/src/views/wms/coil/info.vue @@ -740,7 +740,6 @@ import { listTransferOrderItem } from '@/api/wms/transferOrderItem' // 查询技术部改判调拨的记录 import { listCoilQualityRejudge } from '@/api/wms/coilQualityRejudge' -import CoilInfoRender from '@/views/wms/coil/components/CoilInfo.vue'; import AbnormalTable from '@/views/wms/coil/components/AbnormalTable.vue'; import FileList from "@/components/FileList"; @@ -748,7 +747,6 @@ import FileList from "@/components/FileList"; export default { name: 'CoilInfo', components: { - CoilInfoRender, AbnormalTable, FileList }, diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index 9d6f8510..b6425cbf 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -187,10 +187,10 @@ - + - + diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 3973c856..25232068 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -190,7 +190,8 @@ placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable /> - + + @@ -433,7 +434,7 @@ - + @@ -565,8 +566,8 @@ mm {{ judgeForm.actualWidth || '-' }} mm - {{ judgeForm.length || '-' }} - mm + {{ judgeForm.length || '-' }} + m {{ judgeForm.grossWeight || '-' }} t {{ judgeForm.netWeight || '-' }} t diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index e79801a6..90d70926 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -411,7 +411,7 @@ export default { { label: '厂家', prop: 'manufacturer' }, { label: '调制度', prop: 'temperGrade' }, { label: '镀层种类', prop: 'coatingType' }, - { label: '实测长度(mm)', prop: 'actualLength' }, + { label: '实测长度(m)', prop: 'actualLength' }, { label: '实测宽度(mm)', prop: 'actualWidth' }, { label: '实测厚度(mm)', prop: 'actualThickness' }, { label: '钢卷表面处理', prop: 'coilSurfaceTreatment' }, diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index 8505f093..78504451 100644 --- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -38,7 +38,7 @@ {{ coilInfo.material || '-' }} {{ coilInfo.manufacturer || '-' }} {{ coilInfo.packingStatus || '-' }} - {{ coilInfo.actualLength || '-' }} + {{ coilInfo.actualLength || '-' }} {{ coilInfo.actualWidth || '-' }} {{ coilInfo.actualThickness || '-' }} {{ coilInfo.coilSurfaceTreatment || '-' }} @@ -166,7 +166,7 @@ - + @@ -269,10 +269,10 @@ {{ selectedSplitItem.packingStatus || '-' }} {{ selectedSplitItem.packagingRequirement || '-' }} - {{ selectedSplitItem.actualLength || '-' }} + {{ selectedSplitItem.actualLength || '-' }} {{ selectedSplitItem.actualThickness || '-' }} {{ selectedSplitItem.actualWidth || '-' }} - {{ selectedSplitItem.length || '-' }} + {{ selectedSplitItem.length || '-' }} {{ selectedSplitItem.grossWeight || '-' }} t {{ selectedSplitItem.netWeight || '-' }} t diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue index d7f6c5bd..b66eecf4 100644 --- a/klp-ui/src/views/wms/coil/split.vue +++ b/klp-ui/src/views/wms/coil/split.vue @@ -197,10 +197,10 @@ - + - + diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index c3cd9276..bcacd616 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -194,10 +194,10 @@ - + - +