feat(wms): 新增发货报表页面及图表组件
新增发货报表页面,包含时间趋势折线图和维度汇总柱状图 添加报表数据统计展示和明细表格功能 优化库存汇总页面,增加冷硬卷、冷轧卷等分类统计 重构发货报表页面布局和交互逻辑
This commit is contained in:
@@ -5,31 +5,48 @@
|
||||
<el-form inline>
|
||||
<MaterialSelect :itemType.sync="queryParams.itemType" :itemId.sync="queryParams.itemId" @change="getList" />
|
||||
|
||||
<el-form-item label="逻辑库位">
|
||||
<!-- <el-form-item label="逻辑库位">
|
||||
<WarehouseSelect v-model="queryParams.warehouseId" @change="handleWarehouseChange" />
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
|
||||
<!-- 真实库区 -->
|
||||
<el-form-item label="真实库区">
|
||||
<!-- <el-form-item label="真实库区">
|
||||
<ActualWarehouseSelect
|
||||
v-model="queryParams.actualWarehouseId"
|
||||
@change="handleActualWarehouseChange"
|
||||
:width="220"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
|
||||
<!-- el-descriptions 汇总数据 -->
|
||||
<!-- 汇总数据展示 -->
|
||||
<div class="summary-container" v-if="list.length > 0">
|
||||
<h3>数据汇总</h3>
|
||||
<el-descriptions :column="3" border class="summary-descriptions">
|
||||
<el-descriptions-item label="总卷数">{{ summaryData.totalCoilCount }} 卷</el-descriptions-item>
|
||||
<el-descriptions :column="4" border class="summary-descriptions">
|
||||
<el-descriptions-item label="总卷数" :span="2">{{ summaryData.totalCoilCount }} 卷</el-descriptions-item>
|
||||
<el-descriptions-item label="成品卷数">{{ summaryData.productCoilCount }} 卷</el-descriptions-item>
|
||||
<el-descriptions-item label="原料卷数">{{ summaryData.rawMaterialCoilCount }} 卷</el-descriptions-item>
|
||||
<el-descriptions-item label="总重(t)">{{ summaryData.totalNetWeight }} / {{ summaryData.totalGrossWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="成品总重(t)">{{ summaryData.productTotalNetWeight }} / {{ summaryData.productTotalGrossWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="原料总重(t)">{{ summaryData.rawMaterialTotalNetWeight }} / {{ summaryData.rawMaterialTotalGrossWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总重(t)" :span="2">{{ summaryData.totalNetWeight }} / {{ summaryData.totalGrossWeight
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="成品总重(t)">{{ summaryData.productTotalNetWeight }} / {{
|
||||
summaryData.productTotalGrossWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="原料总重(t)">{{ summaryData.rawMaterialTotalNetWeight }} / {{
|
||||
summaryData.rawMaterialTotalGrossWeight }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="冷硬卷数">{{ summaryData.lowHardCoilCount }} 卷</el-descriptions-item>
|
||||
<el-descriptions-item label="冷轧卷数">{{ summaryData.coldRollCoilCount }} 卷</el-descriptions-item>
|
||||
<el-descriptions-item label="镀锌卷数">{{ summaryData.zincCoilCount }} 卷</el-descriptions-item>
|
||||
<el-descriptions-item label="热轧卷板数">{{ summaryData.hotRollCoilCount }} 卷</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="冷硬卷总重(t)">{{ summaryData.lowHardTotalNetWeight }} / {{
|
||||
summaryData.lowHardTotalGrossWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="冷轧卷总重(t)">{{ summaryData.coldRollTotalNetWeight }} / {{
|
||||
summaryData.coldRollTotalGrossWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="镀锌卷总重(t)">{{ summaryData.zincTotalNetWeight }} / {{ summaryData.zincTotalGrossWeight
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="热轧卷板总重(t)">{{ summaryData.hotRollTotalNetWeight }} / {{
|
||||
summaryData.hotRollTotalGrossWeight }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
<!-- 汇总总卷数,成品卷数,原料卷数,总毛重(t),总净重(t),成品总毛重(t),成品总净重(t),原料总毛重(t),原料总净重(t) -->
|
||||
@@ -54,6 +71,68 @@
|
||||
<el-table-column prop="itemType" label="物料类型" align="center" min-width="120"
|
||||
:formatter="formatItemType"></el-table-column>
|
||||
</el-table>
|
||||
|
||||
<!-- 点击图表项或者表格行后弹出弹窗, 数据详情钻取,获取汇总的数据详情,如果当前是物料统计,钻取将itemType和itemId作为条件查询list;
|
||||
如果当前是仓库统计,将仓库id作为筛选条件 -->
|
||||
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="80%" :close-on-click-modal="false">
|
||||
<div class="drill-down-content">
|
||||
<!-- 钻取条件显示 -->
|
||||
<div class="drill-down-header">
|
||||
<el-tag size="large" v-if="drillDownParams.itemType">
|
||||
{{ drillDownParams.itemType === 'product' ? '成品' : '原材料' }}
|
||||
</el-tag>
|
||||
<el-tag size="large" v-if="drillDownParams.itemName" type="primary">
|
||||
{{ drillDownParams.itemName }}
|
||||
</el-tag>
|
||||
<el-tag size="large" v-if="drillDownParams.warehouseName" type="success">
|
||||
{{ drillDownParams.warehouseName }}
|
||||
</el-tag>
|
||||
</div>
|
||||
|
||||
<!-- 加载状态 -->
|
||||
<el-skeleton :loading="drillDownLoading" animated>
|
||||
<template #template>
|
||||
<div class="demo-skeleton">
|
||||
<el-skeleton-item variant="p" style="width: 80%" />
|
||||
<el-skeleton-item variant="text" style="width: 30%" />
|
||||
<el-skeleton-item variant="text" style="width: 60%" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- 钻取表格 -->
|
||||
<el-table max-height="400" v-loading="drillDownLoading" :data="drillDownList" border stripe
|
||||
style="width: 100%" v-if="!drillDownLoading">
|
||||
<el-table-column prop="warehouseName" label="仓库名称" align="center" min-width="150"></el-table-column>
|
||||
<el-table-column prop="currentCoilNo" label="当前卷号" align="center" min-width="120"></el-table-column>
|
||||
<el-table-column prop="enterCoilNo" label="入场卷号" align="center" min-width="180"></el-table-column>
|
||||
<el-table-column prop="supplierCoilNo" label="厂家卷号" align="center" min-width="180"></el-table-column>
|
||||
<el-table-column label="物料类型" align="center" prop="itemType">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.itemType == 'product' ? '成品' : '原料' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="产品类型" align="center" min-width="250">
|
||||
<template slot-scope="scope">
|
||||
<ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product" />
|
||||
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'"
|
||||
:material="scope.row.rawMaterial" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="更新时间" align="center" prop="updateTime" />
|
||||
<el-table-column prop="grossWeight" label="毛重(t)" align="center" min-width="100"></el-table-column>
|
||||
<el-table-column prop="netWeight" label="净重(t)" align="center" min-width="100"></el-table-column>
|
||||
</el-table>
|
||||
</el-skeleton>
|
||||
|
||||
<!-- 分页 -->
|
||||
<div class="pagination-container" v-if="!drillDownLoading && drillDownList.length > 0">
|
||||
<el-pagination background :current-page.sync="drillDownQueryParams.pageNum"
|
||||
:page-size.sync="drillDownQueryParams.pageSize" :page-sizes="[10, 20, 50, 100]"
|
||||
layout="total, sizes, prev, pager, next, jumper" :total="drillDownTotal"
|
||||
@size-change="handleDrillDownSizeChange" @current-change="handleDrillDownCurrentChange"></el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -89,7 +168,22 @@ export default {
|
||||
productTotalGrossWeight: 0, // 成品总毛重(t)
|
||||
productTotalNetWeight: 0, // 成品总净重(t)
|
||||
rawMaterialTotalGrossWeight: 0, // 原料总毛重(t)
|
||||
rawMaterialTotalNetWeight: 0 // 原料总净重(t)
|
||||
rawMaterialTotalNetWeight: 0, // 原料总净重(t)
|
||||
|
||||
lowHardCoilCount: 0, // 冷硬卷数
|
||||
coldRollCoilCount: 0, // 冷轧卷数
|
||||
zincCoilCount: 0, // 镀锌卷数
|
||||
hotRollCoilCount: 0, // 热轧卷数
|
||||
|
||||
lowHardTotalNetWeight: 0, // 冷硬卷总净重(t)
|
||||
coldRollTotalNetWeight: 0, // 冷轧卷总净重(t)
|
||||
zincTotalNetWeight: 0, // 镀锌卷总净重(t)
|
||||
hotRollTotalNetWeight: 0, // 热轧卷总净重(t)
|
||||
|
||||
lowHardTotalGrossWeight: 0, // 冷硬卷总毛重(t)
|
||||
coldRollTotalGrossWeight: 0, // 冷轧卷总毛重(t)
|
||||
zincTotalGrossWeight: 0, // 镀锌卷总毛重(t)
|
||||
hotRollTotalGrossWeight: 0, // 热轧卷总毛重(t)
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -161,7 +255,22 @@ export default {
|
||||
productTotalGrossWeight: 0,
|
||||
productTotalNetWeight: 0,
|
||||
rawMaterialTotalGrossWeight: 0,
|
||||
rawMaterialTotalNetWeight: 0
|
||||
rawMaterialTotalNetWeight: 0,
|
||||
|
||||
lowHardCoilCount: 0, // 冷硬卷数
|
||||
coldRollCoilCount: 0, // 冷轧卷数
|
||||
zincCoilCount: 0, // 镀锌卷数
|
||||
hotRollCoilCount: 0, // 热轧卷数
|
||||
|
||||
lowHardTotalNetWeight: 0, // 冷硬卷总净重(t)
|
||||
coldRollTotalNetWeight: 0, // 冷轧卷总净重(t)
|
||||
zincTotalNetWeight: 0, // 镀锌卷总净重(t)
|
||||
hotRollTotalNetWeight: 0, // 热轧卷总净重(t)
|
||||
|
||||
lowHardTotalGrossWeight: 0, // 冷硬卷总毛重(t)
|
||||
coldRollTotalGrossWeight: 0, // 冷轧卷总毛重(t)
|
||||
zincTotalGrossWeight: 0, // 镀锌卷总毛重(t)
|
||||
hotRollTotalGrossWeight: 0, // 热轧卷总毛重(t)
|
||||
};
|
||||
|
||||
// 遍历列表数据累加计算
|
||||
@@ -180,13 +289,32 @@ export default {
|
||||
|
||||
summary.totalGrossWeight += grossWeight;
|
||||
summary.totalNetWeight += netWeight;
|
||||
|
||||
let itemName = '';
|
||||
if (item.itemType === 'product') {
|
||||
summary.productTotalGrossWeight += grossWeight;
|
||||
summary.productTotalNetWeight += netWeight;
|
||||
itemName = item.product.productName;
|
||||
} else if (item.itemType === 'raw_material') {
|
||||
summary.rawMaterialTotalGrossWeight += grossWeight;
|
||||
summary.rawMaterialTotalNetWeight += netWeight;
|
||||
itemName = item.rawMaterial.rawMaterialName;
|
||||
}
|
||||
if (itemName == '冷轧卷') {
|
||||
summary.coldRollCoilCount += item.coilCount || 0;
|
||||
summary.coldRollTotalNetWeight += netWeight;
|
||||
summary.coldRollTotalGrossWeight += grossWeight;
|
||||
} else if (itemName == '镀锌卷') {
|
||||
summary.zincCoilCount += item.coilCount || 0;
|
||||
summary.zincTotalNetWeight += netWeight;
|
||||
summary.zincTotalGrossWeight += grossWeight;
|
||||
} else if (itemName == '热轧卷板') {
|
||||
summary.hotRollCoilCount += item.coilCount || 0;
|
||||
summary.hotRollTotalNetWeight += netWeight;
|
||||
summary.hotRollTotalGrossWeight += grossWeight;
|
||||
} else if (itemName == '冷硬卷') {
|
||||
summary.lowHardCoilCount += item.coilCount || 0;
|
||||
summary.lowHardTotalNetWeight += netWeight;
|
||||
summary.lowHardTotalGrossWeight += grossWeight;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user