refactor(wms/report): 调整物理属性列展示字段
分别在入库报表页面和报表模板页面,补充实际长度、实际宽度字段到物理属性分组中,优化报表展示内容
This commit is contained in:
@@ -3,14 +3,8 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-form label-width="80px" inline>
|
<el-form label-width="80px" inline>
|
||||||
<el-form-item label="时间范围" prop="timeRange">
|
<el-form-item label="时间范围" prop="timeRange">
|
||||||
<time-range-picker
|
<time-range-picker v-model="queryParams" start-key="byCreateTimeStart" end-key="byCreateTimeEnd"
|
||||||
v-model="queryParams"
|
:default-start-time="defaultStartTime" :default-end-time="defaultEndTime" @quick-select="handleQuery" />
|
||||||
start-key="byCreateTimeStart"
|
|
||||||
end-key="byCreateTimeEnd"
|
|
||||||
:default-start-time="defaultStartTime"
|
|
||||||
:default-end-time="defaultEndTime"
|
|
||||||
@quick-select="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||||||
@@ -86,13 +80,8 @@
|
|||||||
<columns-setting :reportType="activeColumnConfig"></columns-setting>
|
<columns-setting :reportType="activeColumnConfig"></columns-setting>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<custom-export
|
<custom-export ref="customExport" :visible.sync="customExportVisible" storage-key="coil-report-receive"
|
||||||
ref="customExport"
|
:column-groups="columnGroups" @export="handleCustomExport" />
|
||||||
:visible.sync="customExportVisible"
|
|
||||||
storage-key="coil-report-receive"
|
|
||||||
:column-groups="columnGroups"
|
|
||||||
@export="handleCustomExport"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -162,11 +151,11 @@ export default {
|
|||||||
'基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'],
|
'基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'],
|
||||||
'钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'],
|
'钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'],
|
||||||
'时间': ['createTime', 'exportTime', 'exportBy'],
|
'时间': ['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'],
|
'材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType', 'chromePlateCoilNo', 'rawMaterialThickness'],
|
||||||
'用途': ['purpose', 'businessPurpose'],
|
'用途': ['purpose', 'businessPurpose'],
|
||||||
'状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'],
|
'状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'],
|
||||||
'其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'contractNo' ,'saleName', 'remark', 'team'],
|
'其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'contractNo', 'saleName', 'remark', 'team'],
|
||||||
},
|
},
|
||||||
list: [],
|
list: [],
|
||||||
defaultStartTime: startTime,
|
defaultStartTime: startTime,
|
||||||
@@ -359,5 +348,4 @@ export default {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped></style>
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -562,7 +562,7 @@ export default {
|
|||||||
'基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'],
|
'基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'],
|
||||||
'钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'],
|
'钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'],
|
||||||
'时间': ['createTime', 'exportTime', 'exportBy'],
|
'时间': ['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'],
|
'材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType', 'chromePlateCoilNo', 'rawMaterialThickness'],
|
||||||
'用途': ['purpose', 'businessPurpose'],
|
'用途': ['purpose', 'businessPurpose'],
|
||||||
'状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'],
|
'状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'],
|
||||||
|
|||||||
Reference in New Issue
Block a user