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

71
klp-ui/src/views/wms/coil/do/correct.vue
View File

@@ -24,7 +24,7 @@
<el-option label="未入库钢卷" value="unIn" />
</el-select>
</el-form-item>
<el-form-item label="入场钢卷号" prop="enterCoilNo">
<el-input v-model="materialQueryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
@keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
@@ -58,66 +58,33 @@
<el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{
getTypeLabel(item) }}</el-tag>
<span class="material-type">{{ item.materialType || '原料' }}</span>
<el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
popper-class="material-params-popover">
<el-popover placement="top" width="280" trigger="hover" popper-class="material-params-popover">
<div class="material-params-content">
<div class="params-title">
{{ item.itemType === 'raw_material' ? (item.rawMaterial && item.rawMaterial.rawMaterialName ||
'—') : (item.product && item.product.productName || '—') }}
{{ item.itemName || '—' }}
</div>
<div class="params-list">
<div class="param-item" v-if="item.itemType === 'raw_material' && item.rawMaterial">
<div class="param-row" v-if="item.rawMaterial.rawMaterialCode">
<span class="param-label">编号：</span>
<span class="param-value">{{ item.rawMaterial.rawMaterialCode }}</span>
</div>
<div class="param-row" v-if="item.rawMaterial.specification">
<div class="param-item">
<div class="param-row" v-if="item.specification">
<span class="param-label">规格：</span>
<span class="param-value">{{ item.rawMaterial.specification }}</span>
<span class="param-value">{{ item.specification }}</span>
</div>
<div class="param-row" v-if="item.rawMaterial.material">
<div class="param-row" v-if="item.material">
<span class="param-label">材质：</span>
<span class="param-value">{{ item.rawMaterial.material }}</span>
<span class="param-value">{{ item.material }}</span>
</div>
<div class="param-row" v-if="item.rawMaterial.surfaceTreatment">
<div class="param-row" v-if="item.surfaceTreatmentDesc">
<span class="param-label">表面处理：</span>
<span class="param-value">{{ item.rawMaterial.surfaceTreatment }}</span>
<span class="param-value">{{ item.surfaceTreatmentDesc }}</span>
</div>
<div class="param-row" v-if="item.rawMaterial.zincLayer">
<div class="param-row" v-if="item.zincLayer">
<span class="param-label">镀层质量：</span>
<span class="param-value">{{ item.rawMaterial.zincLayer }}</span>
<span class="param-value">{{ item.zincLayer }}</span>
</div>
<div class="param-row" v-if="item.rawMaterial.manufacturer">
<div class="param-row" v-if="item.manufacturer">
<span class="param-label">厂家：</span>
<span class="param-value">{{ item.rawMaterial.manufacturer }}</span>
</div>
</div>
<div class="param-item" v-else-if="item.itemType === 'product' && item.product">
<div class="param-row" v-if="item.product.productCode">
<span class="param-label">编号：</span>
<span class="param-value">{{ item.product.productCode }}</span>
</div>
<div class="param-row" v-if="item.product.specification">
<span class="param-label">规格：</span>
<span class="param-value">{{ item.product.specification }}</span>
</div>
<div class="param-row" v-if="item.product.material">
<span class="param-label">材质：</span>
<span class="param-value">{{ item.product.material }}</span>
</div>
<div class="param-row" v-if="item.product.surfaceTreatment">
<span class="param-label">表面处理：</span>
<span class="param-value">{{ item.product.surfaceTreatment }}</span>
</div>
<div class="param-row" v-if="item.product.zincLayer">
<span class="param-label">镀层质量：</span>
<span class="param-value">{{ item.product.zincLayer }}</span>
</div>
<div class="param-row" v-if="item.product.manufacturer">
<span class="param-label">厂家：</span>
<span class="param-value">{{ item.product.manufacturer }}</span>
<span class="param-value">{{ item.manufacturer }}</span>
</div>
</div>
<div class="param-divider"></div>
@@ -184,7 +151,7 @@
</div>
</div>
</div>
</div>
</div>
<i slot="reference" class="el-icon-setting param-icon"></i>
</el-popover>
@@ -649,7 +616,7 @@ export default {
this.correctVisible = true;
this.title = "添加钢卷物料";
},
/** 追溯按钮操作 */
/** 追溯按钮操作 */
handleTrace(row) {
this.traceOpen = true;
this.traceLoading = true;
@@ -992,10 +959,8 @@ export default {
},
/** 获取物品名称 */
getItemName(item) {
if (item.itemType === 'product' && item.product) {
return item.product.productName || ''
} else if (item.itemType === 'raw_material' && item.rawMaterial) {
return item.rawMaterial.rawMaterialName || ''
if (item.itemName) {
return item.itemName
}
return '—'
},

17
klp-ui/src/views/wms/coil/do/search.vue
View File

@@ -169,24 +169,17 @@
<div class="header-left">
<current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
<span class="material-type">{{ item.materialType || '原料' }}</span>
<el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
<el-popover placement="top" width="280" trigger="hover"
popper-class="material-params-popover">
<div class="material-params-content">
<div class="params-title">
{{ item.itemType === 'raw_material' ? (item.rawMaterial && item.rawMaterial.rawMaterialName ||
'—') : (item.product && item.product.productName || '—') }}
{{ item.itemName || '—' }}
</div>
<div class="params-list">
<div class="param-item" v-if="item.itemType === 'raw_material' && item.rawMaterial">
<div class="param-row" v-if="item.rawMaterial.specification">
<div class="param-item">
<div class="param-row" v-if="item.specification">
<span class="param-label">规格：</span>
<span class="param-value">{{ item.rawMaterial.specification }}</span>
</div>
</div>
<div class="param-item" v-else-if="item.itemType === 'product' && item.product">
<div class="param-row" v-if="item.product.specification">
<span class="param-label">规格：</span>
<span class="param-value">{{ item.product.specification }}</span>
<span class="param-value">{{ item.specification }}</span>
</div>
</div>
<div class="param-divider"></div>

7
klp-ui/src/views/wms/coil/do/warehousing.vue
View File

@@ -726,8 +726,7 @@ export default {
}
const row = res.rows[0]
this.labelRender.loading = false;
const item = row.itemType === 'product' ? row.product : row.rawMaterial;
const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
const itemName = row.itemName || '';
this.labelRender.type = row.itemType === 'product' ? '3' : '2'
this.labelRender.data = {
...row,
@@ -744,9 +743,7 @@ export default {
return
}
const row = res.rows[0]
// this.labelRender.loading = false;
const item = row.itemType === 'product' ? row.product : row.rawMaterial;
const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
const itemName = row.itemName || '';
this.labelRender.type = row.itemType === 'product' ? '3' : '2'
this.labelRender.data = {
...row,