feat(报表): 添加宽度和厚度列并调整产品类型列宽

在合并报表页面中新增宽度和厚度显示列,同时将产品类型列的宽度从250调整为150以优化布局
This commit is contained in:
砂糖
2026-03-18 15:59:41 +08:00
parent 43d75de61f
commit 0b451a9fb9

View File

@@ -80,12 +80,14 @@
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="逻辑库位" align="center" prop="warehouseName" />
<!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
<el-table-column label="产品类型" align="center" width="250">
<el-table-column label="产品类型" align="center" width="150">
<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="computedWidth" width="70" />
<el-table-column label="厚度(米)" align="center" prop="computedThickness" width="70" />
<el-table-column label="重量 (吨)" align="center" prop="netWeight" />
<el-table-column label="长度 (米)" align="center" prop="length" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
@@ -108,12 +110,14 @@
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="逻辑库位" align="center" prop="warehouseName" />
<el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
<el-table-column label="产品类型" align="center" width="250">
<el-table-column label="产品类型" align="center" width="150">
<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="computedWidth" width="70" />
<el-table-column label="厚度(米)" align="center" prop="computedThickness" width="70" />
<el-table-column label="重量 (吨)" align="center" prop="netWeight" />
<el-table-column label="长度 (米)" align="center" prop="length" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
@@ -242,7 +246,7 @@ export default {
this.loading = true;
const res1 = await listPendingAction({ ...this.queryParams, actionType: 201, actionStatus: 2 });
const res2 = await listPendingAction({ ...this.queryParams, actionType: 202, actionStatus: 2 });
const res3 = await listPendingAction({ ...this.queryParams, actionType: 203, actionStatus: 2 });
const res4 = await listPendingAction({ ...this.queryParams, actionType: 204, actionStatus: 2 });
const res5 = await listPendingAction({ ...this.queryParams, actionType: 205, actionStatus: 2 });