feat(成品管理): 添加成品相关表格列并调整标签类型
为成品物料添加质量状态、切边要求等表格列,同时将rubbish.vue中的labelType从3改为2
This commit is contained in:
@@ -120,6 +120,33 @@
|
|||||||
<el-table-column label="班组" align="center" prop="team" />
|
<el-table-column label="班组" align="center" prop="team" />
|
||||||
<el-table-column label="毛重" align="center" prop="grossWeight" />
|
<el-table-column label="毛重" align="center" prop="grossWeight" />
|
||||||
<el-table-column label="净重" align="center" prop="netWeight" />
|
<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">
|
<el-table-column label="关联信息" align="center" prop="parentCoilNos" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.parentCoilNos && scope.row.hasMergeSplit === 1 && scope.row.dataType === 1">
|
<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)
|
const item = findItemWithBom(row.itemType, row.itemId)
|
||||||
// 寻找boms中bom键名为'材质'的
|
// 寻找boms中bom键名为'材质'的
|
||||||
const material = item?.boms?.find(bom => bom.attrKey === '材质')
|
const material = item?.boms?.find(bom => bom.attrKey === '材质')
|
||||||
// 查找boms中bom键名为'规格'的
|
|
||||||
const specification = item?.boms?.find(bom => bom.attrKey === '规格')
|
console.log('规格', item)
|
||||||
this.labelRender.data = {
|
this.labelRender.data = {
|
||||||
...row,
|
...row,
|
||||||
itemName: item?.itemName || '',
|
itemName: item?.itemName || '',
|
||||||
material: material?.attrValue || '',
|
material: material?.attrValue || '',
|
||||||
specification: specification?.attrValue || item?.specification || '',
|
specification: item?.specification || '',
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
/** 下载二维码 */
|
/** 下载二维码 */
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export default {
|
|||||||
// warehouseId: 111,
|
// warehouseId: 111,
|
||||||
},
|
},
|
||||||
hideWarehouseQuery: true,
|
hideWarehouseQuery: true,
|
||||||
labelType: '3',
|
labelType: '2',
|
||||||
hideType: false,
|
hideType: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user