DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms): 重构物料信息展示逻辑，移除冗余组件

Browse Source 
重构物料信息展示逻辑，统一使用itemName等字段替代原有的product和rawMaterial嵌套结构
删除不再使用的BomInfo、CategoryRenderer等冗余组件
新增report模块配置集中管理
优化代码结构，提升可维护性
This commit is contained in:
砂糖
2026-03-24 13:55:10 +08:00
parent 9738a32d9d
commit ae68b40ee6
65 changed files with 363 additions and 3479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
klp-ui/src/views/wms/coil/merge.vue
View File

@@ -48,7 +48,7 @@
</div>
<div class="source-detail-row">
<span class="detail-label">物料名称：</span>
<span class="detail-value">{{ item.materialName || item.productName || '—' }}</span>
<span class="detail-value">{{ item.itemName || '—' }}</span>
</div>
<div class="source-detail-row" v-if="item.specification">
<span class="detail-label">物料规格：</span>
@@ -482,8 +482,6 @@ export default {
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: '',
specification: '',
grossWeight: undefined,
netWeight: undefined,
@@ -498,8 +496,6 @@ export default {
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: '',
specification: '',
grossWeight: undefined,
netWeight: undefined,
@@ -538,11 +534,10 @@ export default {
currentCoilNo: data.currentCoilNo || '',
itemType: data.itemType,
itemId: data.itemId,
itemName: data.itemName || '',
warehouseName: data.warehouseName || (data.warehouse ? data.warehouse.warehouseName : ''),
actualWarehouseName: data.actualWarehouseName || (data.actualWarehouse ? data.actualWarehouse.warehouseName : ''),
materialName: data.materialName || (data.rawMaterial ? data.rawMaterial.rawMaterialName : ''),
productName: data.productName || (data.product ? data.product.productName : ''),
specification: data.rawMaterial?.specification || data.product?.specification || '',
specification: data?.specification || '',
bomItems: data.bomItemList || [],
grossWeight: data.grossWeight || null,
netWeight: data.netWeight || null,
@@ -557,8 +552,6 @@ export default {
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: '',
specification: '',
bomItems: [],
grossWeight: null,
@@ -616,15 +609,13 @@ export default {
currentCoilNo: data.currentCoilNo || '',
itemType: data.itemType,
itemId: data.itemId,
itemName: data.itemName || '',
warehouseName: data.warehouseName || (data.warehouse ? data.warehouse.warehouseName : ''),
actualWarehouseName: data.actualWarehouseName || (data.actualWarehouse ? data.actualWarehouse.warehouseName : ''),
materialName: data.materialName || (data.rawMaterial ? data.rawMaterial.rawMaterialName : ''),
productName: data.productName || (data.product ? data.product.productName : ''),
specification: data.rawMaterial?.specification || data.product?.specification || '',
specification: data.specification || '',
grossWeight: data.grossWeight || null,
netWeight: data.netWeight || null,
length: data.length || null,
bomItems: data.bomItemList || [],
actionId: pending.actionId // 保存待操作ID，用于后续完成操作
});
@@ -653,7 +644,7 @@ export default {
if (!item) return '';
// 获取名称（原材料或产品）
const name = item.rawMaterialName || item.productName || '';
const name = item.itemName || '';
if (!name) return '';
let displayName = name;
@@ -692,8 +683,7 @@ export default {
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: '',
itemName: '',
specification: '',
bomItems: []
});
@@ -799,9 +789,8 @@ export default {
itemId: data.itemId,
warehouseName: data.warehouseName || (data.warehouse ? data.warehouse.warehouseName : ''),
actualWarehouseName: data.actualWarehouseName || (data.actualWarehouse ? data.actualWarehouse.warehouseName : ''),
materialName: data.materialName || (data.rawMaterial ? data.rawMaterial.rawMaterialName : ''),
productName: data.productName || (data.product ? data.product.productName : ''),
specification: data.rawMaterial?.specification || data.product?.specification || '',
itemName: data.itemName || '',
specification: data.specification || '',
grossWeight: data.grossWeight || null,
netWeight: data.netWeight || null,
length: data.length || null,