refactor(wms/report): 调整物理属性列展示字段
分别在入库报表页面和报表模板页面,补充实际长度、实际宽度字段到物理属性分组中,优化报表展示内容
This commit is contained in:
@@ -3,14 +3,8 @@
|
||||
<el-row>
|
||||
<el-form label-width="80px" inline>
|
||||
<el-form-item label="时间范围" prop="timeRange">
|
||||
<time-range-picker
|
||||
v-model="queryParams"
|
||||
start-key="byCreateTimeStart"
|
||||
end-key="byCreateTimeEnd"
|
||||
:default-start-time="defaultStartTime"
|
||||
:default-end-time="defaultEndTime"
|
||||
@quick-select="handleQuery"
|
||||
/>
|
||||
<time-range-picker v-model="queryParams" start-key="byCreateTimeStart" end-key="byCreateTimeEnd"
|
||||
:default-start-time="defaultStartTime" :default-end-time="defaultEndTime" @quick-select="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入场钢卷号" prop="endTime">
|
||||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||||
@@ -45,7 +39,7 @@
|
||||
<muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
|
||||
placeholder="请选择品质" clearable />
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="收货计划" prop="planId">
|
||||
<el-select style="width: 200px;" v-model="queryParams.planId" placeholder="请输入计划名称搜索收货计划" filterable remote
|
||||
:remote-method="remoteMethod">
|
||||
@@ -86,13 +80,8 @@
|
||||
<columns-setting :reportType="activeColumnConfig"></columns-setting>
|
||||
</el-dialog>
|
||||
|
||||
<custom-export
|
||||
ref="customExport"
|
||||
:visible.sync="customExportVisible"
|
||||
storage-key="coil-report-receive"
|
||||
:column-groups="columnGroups"
|
||||
@export="handleCustomExport"
|
||||
/>
|
||||
<custom-export ref="customExport" :visible.sync="customExportVisible" storage-key="coil-report-receive"
|
||||
:column-groups="columnGroups" @export="handleCustomExport" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -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 {
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
<style scoped></style>
|
||||
|
||||
@@ -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'],
|
||||
|
||||
Reference in New Issue
Block a user