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

feat(钢卷管理): 添加成品钢卷的质量状态、切边要求等字段

Browse Source 
在钢卷管理的分条、合卷和基础信息页面中，为成品类型的钢卷新增质量状态、切边要求、打包状态和包装要求字段
同时移除未使用的采购计划相关代码
This commit is contained in:
砂糖
2025-11-14 09:49:33 +08:00
parent 6f448faa45
commit bbbe7cefd8
6 changed files with 266 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,14 +28,8 @@
<div class="source-info">
<div class="source-id">{{ item.currentCoilNo || '待选择' }}</div>
</div>
<el-button
v-if="!readonly"
type="text"
size="mini"
icon="el-icon-delete"
@click="removeSourceCoil(index)"
class="btn-remove"
></el-button>
<el-button v-if="!readonly" type="text" size="mini" icon="el-icon-delete" @click="removeSourceCoil(index)"
class="btn-remove"></el-button>
</div>
<div class="source-coil-body">
<template v-if="item.coilId">
@@ -59,7 +53,7 @@
<span class="detail-label">物料规格：</span>
<span class="detail-value">{{ item.specification }}</span>
</div>
<!-- 参数参数展示 -->
<template v-if="item.bomItems && item.bomItems.length > 0">
<div class="source-detail-divider">参数参数</div>
@@ -76,12 +70,8 @@
<template v-else-if="index === 1 && !readonly">
<div class="pending-list-title">待合卷钢卷列表</div>
<div class="pending-coil-list" v-if="pendingMergeList.length > 0">
<div
class="pending-coil-item"
v-for="pending in pendingMergeList"
:key="pending.actionId"
@click="selectPendingCoil(pending, index)"
>
<div class="pending-coil-item" v-for="pending in pendingMergeList" :key="pending.actionId"
@click="selectPendingCoil(pending, index)">
<div class="pending-coil-no">{{ pending.currentCoilNo }}</div>
<div class="pending-coil-info">
<span class="pending-label">扫码时间：</span>
@@ -110,19 +100,10 @@
<div class="merge-arrow-container">
<svg width="120" height="100%" viewBox="0 0 120 400" xmlns="http://www.w3.org/2000/svg">
<!-- 多条线汇聚到一点 -->
<line
v-for="(item, index) in sourceCoils"
:key="index"
:x1="0"
:y1="50 + index * 80"
:x2="100"
:y2="200"
stroke="#0066cc"
stroke-width="2"
stroke-dasharray="5,5"
/>
<line v-for="(item, index) in sourceCoils" :key="index" :x1="0" :y1="50 + index * 80" :x2="100" :y2="200"
stroke="#0066cc" stroke-width="2" stroke-dasharray="5,5" />
<!-- 箭头 -->
<polygon points="100,200 110,195 110,205" fill="#0066cc"/>
<polygon points="100,200 110,195 110,205" fill="#0066cc" />
</svg>
</div>
<div class="flow-label">
@@ -148,79 +129,69 @@
<el-input v-model="targetCoil.team" placeholder="请输入班组名称" :disabled="readonly"></el-input>
</el-form-item>
<el-form-item label="材料类型">
<el-select
v-model="targetCoil.materialType"
placeholder="请选择材料类型"
style="width: 100%"
:disabled="readonly"
@change="handleMaterialTypeChange">
<el-select v-model="targetCoil.materialType" placeholder="请选择材料类型" style="width: 100%"
:disabled="readonly" @change="handleMaterialTypeChange">
<el-option label="原料" value="原料" />
<el-option label="成品" value="成品" />
<el-option label="废品" value="废品" />
</el-select>
</el-form-item>
<!-- 物品类型由材料类型自动联动，隐藏此选择框 -->
<el-form-item v-if="targetCoil.materialType === '成品'" label="质量状态" prop="qualityStatus">
<el-input v-model="targetCoil.qualityStatus"
placeholder="请输入质量状态" :disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="targetCoil.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
<el-input v-model="targetCoil.trimmingRequirement"
placeholder="请输入切边要求" :disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="targetCoil.materialType === '成品'" label="打包状态" prop="packingStatus">
<el-input v-model="targetCoil.packingStatus"
placeholder="请输入打包状态" :disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="targetCoil.materialType === '成品'" label="包装要求" prop="packagingRequirement">
<el-input v-model="targetCoil.packagingRequirement"
placeholder="请输入包装要求" :disabled="readonly">
</el-input>
</el-form-item>
<el-form-item :label="getItemLabel">
<el-select
v-model="targetCoil.itemId"
:placeholder="getItemPlaceholder"
filterable
remote
:remote-method="searchItems"
:loading="itemSearchLoading"
style="width: 100%"
:disabled="readonly || !targetCoil.materialType"
>
<el-option
v-for="item in currentItemList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
<el-select v-model="targetCoil.itemId" :placeholder="getItemPlaceholder" filterable remote
:remote-method="searchItems" :loading="itemSearchLoading" style="width: 100%"
:disabled="readonly || !targetCoil.materialType">
<el-option v-for="item in currentItemList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="毛重(t)">
<el-input
v-model.number="targetCoil.grossWeight"
placeholder="请输入毛重"
type="number"
step="0.01"
:disabled="readonly"
>
<el-input v-model.number="targetCoil.grossWeight" placeholder="请输入毛重" type="number" step="0.01"
:disabled="readonly">
<template slot="append">吨</template>
</el-input>
</el-form-item>
<el-form-item label="净重(t)">
<el-input
v-model.number="targetCoil.netWeight"
placeholder="请输入净重"
type="number"
step="0.01"
:disabled="readonly"
>
<el-input v-model.number="targetCoil.netWeight" placeholder="请输入净重" type="number" step="0.01"
:disabled="readonly">
<template slot="append">吨</template>
</el-input>
</el-form-item>
<el-form-item label="逻辑库区">
<el-select v-model="targetCoil.warehouseId" placeholder="请选择逻辑库区" style="width: 100%" filterable :disabled="readonly">
<el-option
v-for="warehouse in warehouseList"
:key="warehouse.warehouseId"
:label="warehouse.warehouseName"
:value="warehouse.warehouseId"
/>
<el-select v-model="targetCoil.warehouseId" placeholder="请选择逻辑库区" style="width: 100%" filterable
:disabled="readonly">
<el-option v-for="warehouse in warehouseList" :key="warehouse.warehouseId"
:label="warehouse.warehouseName" :value="warehouse.warehouseId" />
</el-select>
</el-form-item>
<el-form-item label="真实库区">
<actual-warehouse-select
v-model="targetCoil.actualWarehouseId"
placeholder="请选择"
style="width: 100%"
clearable
:disabled="readonly"
/>
<actual-warehouse-select v-model="targetCoil.actualWarehouseId" placeholder="请选择" style="width: 100%"
clearable :disabled="readonly" />
</el-form-item>
</el-form>
</div>
@@ -242,10 +213,7 @@
</div>
<!-- 钢卷选择器 -->
<coil-selector
:visible.sync="coilSelectorVisible"
@select="handleCoilSelect"
/>
<coil-selector :visible.sync="coilSelectorVisible" @select="handleCoilSelect" />
</div>
</template>
@@ -405,7 +373,7 @@ export default {
handleMaterialTypeChange(value) {
// 清空物品选择
this.$set(this.targetCoil, 'itemId', null);
// 根据材料类型设置物品类型并恢复完整列表
if (value === '成品') {
this.$set(this.targetCoil, 'itemType', 'product');
@@ -417,7 +385,7 @@ export default {
this.rawMaterialList = [...this.allRawMaterials];
}
},
// 加载第一个钢卷（从待操作进入时）
async loadFirstCoil(coilId) {
try {
@@ -479,7 +447,7 @@ export default {
async loadPendingMergeList() {
try {
this.pendingLoading = true;
// 分别查询待处理和处理中的记录
const responses = await Promise.all([
listPendingAction({
@@ -495,16 +463,16 @@ export default {
pageSize: 1000
})
]);
// 合并两个列表
const allPending = [
...(responses[0].rows || []),
...(responses[1].rows || [])
];
// 排除当前钢卷
const currentCoilId = this.sourceCoils[0] ? this.sourceCoils[0].coilId : null;
this.pendingMergeList = allPending.filter(item => item.coilId !== currentCoilId);
} catch (error) {
console.error('加载待合卷列表失败', error);
@@ -559,35 +527,35 @@ export default {
// 格式化物品名称（添加规格和参数信息）
formatItemName(item) {
if (!item) return '';
// 获取名称（原材料或产品）
const name = item.rawMaterialName || item.productName || '';
if (!name) return '';
let displayName = name;
const specs = [];
// 1. 优先显示规格（从对象的specification字段）
if (item.specification) {
specs.push(item.specification);
}
// 2. 添加参数参数（最多2个）
if (item.bomItems && item.bomItems.length > 0) {
const bomParams = item.bomItems
.filter(bomItem => bomItem.attrKey && bomItem.attrValue)
.slice(0, 2); // 最多2个参数参数
bomParams.forEach(param => {
specs.push(`${param.attrKey}:${param.attrValue}`);
});
}
// 3. 拼接成最终格式
if (specs.length > 0) {
displayName += `（${specs.join(' ')}）`;
}
return displayName;
},
@@ -631,12 +599,12 @@ export default {
if (!itemType) {
return;
}
try {
this.itemSearchLoading = true;
if (itemType === 'raw_material') {
const response = await listRawMaterial({
pageNum: 1,
const response = await listRawMaterial({
pageNum: 1,
pageSize: 100,
withBom: true
});
@@ -644,8 +612,8 @@ export default {
this.rawMaterialList = response.rows || [];
}
} else if (itemType === 'product') {
const response = await listProduct({
pageNum: 1,
const response = await listProduct({
pageNum: 1,
pageSize: 100,
withBom: true
});
@@ -666,7 +634,7 @@ export default {
this.$message.warning('请先选择材料类型');
return;
}
// 如果没有输入，恢复完整列表
if (!query || query.trim() === '') {
if (this.targetCoil.itemType === 'raw_material') {
@@ -676,10 +644,10 @@ export default {
}
return;
}
// 前端过滤：在已加载的数据中搜索
const searchQuery = query.toLowerCase().trim();
if (this.targetCoil.itemType === 'raw_material') {
// 从备份列表中过滤原材料
this.rawMaterialList = this.allRawMaterials.filter(item => {
@@ -688,11 +656,11 @@ export default {
// 搜索规格
const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
// 搜索 参数 参数
const bomMatch = item.bomItems && item.bomItems.some(bom =>
const bomMatch = item.bomItems && item.bomItems.some(bom =>
(bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
(bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
);
return nameMatch || specMatch || bomMatch;
});
} else if (this.targetCoil.itemType === 'product') {
@@ -703,11 +671,11 @@ export default {
// 搜索规格
const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
// 搜索 参数 参数
const bomMatch = item.bomItems && item.bomItems.some(bom =>
const bomMatch = item.bomItems && item.bomItems.some(bom =>
(bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
(bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
);
return nameMatch || specMatch || bomMatch;
});
}
@@ -837,7 +805,7 @@ export default {
text: '正在合卷，请稍后...',
background: 'rgba(0, 0, 0, 0.7)'
});
const response = await mergeMaterialCoil(mergeData);
if (response.code === 200) {
this.$message.success('合卷保存成功');
@@ -1123,17 +1091,17 @@ export default {
align-items: flex-start;
margin-bottom: 8px;
font-size: 13px;
&:last-child {
margin-bottom: 0;
}
.detail-label {
color: #909399;
min-width: 90px;
flex-shrink: 0;
}
.detail-value {
color: #303133;
flex: 1;
@@ -1159,12 +1127,12 @@ export default {
align-items: center;
margin-bottom: 6px;
font-size: 12px;
.bom-key {
color: #909399;
min-width: 60px;
}
.bom-value {
color: #303133;
flex: 1;
@@ -1288,4 +1256,3 @@ export default {
}
}
</style>