diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index 1e9447d4c..35f8539ef 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -3,14 +3,8 @@ - + - + @@ -86,13 +80,8 @@ - + @@ -162,11 +151,11 @@ export default { '基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'], '钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'], '时间': ['createTime', 'exportTime', 'exportBy'], - '物理属性': ['netWeight', 'length', 'specification', 'actualThickness', 'theoreticalThickness', 'theoreticalLength'], + '物理属性': ['netWeight', 'length', 'specification', 'actualThickness', 'actualLength', 'actualWidth', 'theoreticalThickness', 'theoreticalLength'], '材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType', 'chromePlateCoilNo', 'rawMaterialThickness'], '用途': ['purpose', 'businessPurpose'], '状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'], - '其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'contractNo' ,'saleName', 'remark', 'team'], + '其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'contractNo', 'saleName', 'remark', 'team'], }, list: [], defaultStartTime: startTime, @@ -188,7 +177,7 @@ export default { loading: false, receiveColumns: [], - + // 厂家材质透视表配置 hierarchicalPivotConfig: { groupFields: ['manufacturer', 'material', 'specification'], @@ -204,7 +193,7 @@ export default { return value.toFixed(3) } }, - + // 宽度厚度统计表配置 crossTableConfig: { rowField: 'computedWidth', @@ -359,5 +348,4 @@ export default { } - + diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue index fd2cd111b..0c699af29 100644 --- a/klp-ui/src/views/wms/report/template/action.vue +++ b/klp-ui/src/views/wms/report/template/action.vue @@ -562,7 +562,7 @@ export default { '基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'], '钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'], '时间': ['createTime', 'exportTime', 'exportBy'], - '物理属性': ['netWeight', 'length', 'specification', 'actualThickness', 'theoreticalThickness', 'theoreticalLength', 'scheduleThickness'], + '物理属性': ['netWeight', 'length', 'specification', 'actualThickness', 'actualLength', 'actualWidth', 'theoreticalThickness', 'theoreticalLength', 'scheduleThickness'], '材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType', 'chromePlateCoilNo', 'rawMaterialThickness'], '用途': ['purpose', 'businessPurpose'], '状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'],