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

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2025-11-14 10:32:11 +08:00
parent db691a68a7 c351a2b551
commit 6b6cd2cbbf
5 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,11 @@ export default {
grossWeight: null,
netWeight: null,
warehouseId: null,
actualWarehouseId: null
actualWarehouseId: null,
qualityStatus: '',
packagingRequirement: '',
packingStatus: '',
trimmingRequirement: ''
},
loading: false,
// 钢卷选择器可见性
@@ -407,7 +411,8 @@ export default {
materialName: data.materialName || (data.rawMaterial ? data.rawMaterial.rawMaterialName : ''),
productName: data.productName || (data.product ? data.product.productName : ''),
specification: data.rawMaterial?.specification || data.product?.specification || '',
bomItems: data.bomItemList || []
bomItems: data.bomItemList || [],
},
{
coilId: null,
@@ -782,16 +787,8 @@ export default {
.join(',');
const mergeData = {
...this.targetCoil,
enterCoilNo: enterCoilNos, // 拼接的入场钢卷号
currentCoilNo: this.targetCoil.currentCoilNo,
team: this.targetCoil.team,
materialType: this.targetCoil.materialType,
itemType: this.targetCoil.itemType,
itemId: this.targetCoil.itemId,
grossWeight: this.targetCoil.grossWeight,
netWeight: this.targetCoil.netWeight,
warehouseId: this.targetCoil.warehouseId,
actualWarehouseId: this.targetCoil.actualWarehouseId,
hasMergeSplit: 2, // 2表示合卷
newCoils: this.sourceCoils.map(item => ({
coilId: item.coilId,

34
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -120,6 +120,33 @@
<el-table-column label="班组" align="center" prop="team" />
<el-table-column label="毛重" align="center" prop="grossWeight" />
<el-table-column label="净重" align="center" prop="netWeight" />
<el-table-column v-if="querys.materialType === '成品'" label="质量状态" align="center" prop="qualityStatus" />
<el-table-column v-if="querys.materialType === '成品'" label="切边要求" align="center" prop="trimmingRequirement" />
<el-table-column v-if="querys.materialType === '成品'" label="打包状态" align="center" prop="packingStatus" />
<el-table-column v-if="querys.materialType === '成品'" label="包装要求" align="center" prop="packagingRequirement" />
<!-- <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态"
:disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求"
:disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态"
:disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求"
:disabled="readonly">
</el-input>
</el-form-item> -->
<el-table-column label="关联信息" align="center" prop="parentCoilNos" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.parentCoilNos && scope.row.hasMergeSplit === 1 && scope.row.dataType === 1">
@@ -452,13 +479,14 @@ export default {
const item = findItemWithBom(row.itemType, row.itemId)
// 寻找boms中bom键名为'材质'的
const material = item?.boms?.find(bom => bom.attrKey === '材质')
// 查找boms中bom键名为'规格'的
const specification = item?.boms?.find(bom => bom.attrKey === '规格')
console.log('规格', item)
this.labelRender.data = {
...row,
itemName: item?.itemName || '',
material: material?.attrValue || '',
specification: specification?.attrValue || item?.specification || '',
specification: item?.specification || '',
};
},
/** 下载二维码 */

2
klp-ui/src/views/wms/coil/rubbish.vue
View File

@@ -19,7 +19,7 @@ export default {
// warehouseId: 111,
},
hideWarehouseQuery: true,
labelType: '3',
labelType: '2',
hideType: false,
}
}

15
klp-ui/src/views/wms/coil/split.vue
View File

@@ -577,7 +577,11 @@ export default {
grossWeight: null,
netWeight: null,
warehouseId: null,
actualWarehouseId: null
actualWarehouseId: null,
qualityStatus: '',
packagingRequirement: '',
packingStatus: '',
trimmingRequirement: ''
});
},
@@ -653,16 +657,9 @@ export default {
currentCoilNo: this.motherCoil.currentCoilNo,
hasMergeSplit: 1, // 1表示分条
newCoils: this.splitList.map(item => ({
enterCoilNo: this.motherCoil.enterCoilNo, // 子卷继承母卷的入场钢卷号
currentCoilNo: item.currentCoilNo,
team: item.team,
materialType: item.materialType,
...item,
itemType: item.itemType || this.motherCoil.itemType,
itemId: item.itemId || this.motherCoil.itemId,
grossWeight: item.grossWeight,
netWeight: item.netWeight,
warehouseId: item.warehouseId,
actualWarehouseId: item.actualWarehouseId,
hasMergeSplit: 1
}))
};

38
klp-ui/src/views/wms/coil/typing.vue
View File

@@ -260,7 +260,11 @@ export default {
netWeight: null,
warehouseId: null,
actualWarehouseId: null,
remark: ''
remark: '',
qualityStatus: '',
packagingRequirement: '',
packingStatus: '',
trimmingRequirement: ''
},
rules: {
currentCoilNo: [
@@ -344,9 +348,6 @@ export default {
return [];
}
},
watch: {
// 不再需要watch，直接用@change事件处理
},
async created() {
// 先加载库区列表
await this.loadWarehouses();
@@ -400,27 +401,11 @@ export default {
// 填充当前信息（左侧）
this.currentInfo = {
coilId: data.coilId,
enterCoilNo: data.enterCoilNo || '',
currentCoilNo: data.currentCoilNo || '',
supplierCoilNo: data.supplierCoilNo || '',
team: data.team || '',
itemType: data.itemType || null,
itemId: data.itemId || null,
...data,
itemName: this.getItemName(data),
grossWeight: data.grossWeight,
netWeight: data.netWeight,
warehouseId: data.warehouseId,
actualWarehouseId: data.actualWarehouseId,
nextWarehouseName: this.getWarehouseName(data.warehouseId),
remark: data.remark || ''
};
// 重新获取库区名称（确保warehouseList已加载）
if (data.warehouseId) {
this.currentInfo.nextWarehouseName = this.getWarehouseName(data.warehouseId);
}
// 加载对应类型的物品列表
if (data.itemType) {
await this.loadItemList(data.itemType);
@@ -684,19 +669,10 @@ export default {
// 构造更新数据（使用标准update接口，直接更新原记录）
const updateData = {
...this.updateForm,
coilId: this.currentInfo.coilId,
enterCoilNo: this.currentInfo.enterCoilNo,
supplierCoilNo: this.currentInfo.supplierCoilNo,
currentCoilNo: this.updateForm.currentCoilNo,
team: this.updateForm.team,
materialType: this.updateForm.materialType,
itemType: this.updateForm.itemType,
itemId: this.updateForm.itemId,
grossWeight: this.updateForm.grossWeight,
netWeight: this.updateForm.netWeight,
warehouseId: this.updateForm.warehouseId,
actualWarehouseId: this.updateForm.actualWarehouseId,
remark: this.updateForm.remark
// 注意：不要传newCoils，否则会走批量更新逻辑
};