|
@@ -78,6 +78,18 @@
|
|
|
}}
|
|
}}
|
|
|
</span>
|
|
</span>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
+ <!-- 质检状态 -->
|
|
|
|
|
+ <template v-slot:qualityStatus="{ row }">
|
|
|
|
|
+ <span v-if="row.qualityStatus == 0">未质检</span>
|
|
|
|
|
+ <span v-else-if="row.qualityStatus == 1">已质检</span>
|
|
|
|
|
+ <span v-else>-</span>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ <!-- 质检结果 -->
|
|
|
|
|
+ <template v-slot:qualityResult="{ row }">
|
|
|
|
|
+ <span v-if="row.qualityResult == 0">合格</span>
|
|
|
|
|
+ <span v-else-if="row.qualityResult == 1">不合格</span>
|
|
|
|
|
+ <span v-else>-</span>
|
|
|
|
|
+ </template>
|
|
|
<!-- 操作列 -->
|
|
<!-- 操作列 -->
|
|
|
<template v-slot:action="{ row }">
|
|
<template v-slot:action="{ row }">
|
|
|
<el-link
|
|
<el-link
|
|
@@ -212,12 +224,14 @@
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
prop: 'qualityStatus',
|
|
prop: 'qualityStatus',
|
|
|
|
|
+ slot: 'qualityStatus',
|
|
|
label: '质检状态',
|
|
label: '质检状态',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
width: 100
|
|
width: 100
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
prop: 'qualityResult',
|
|
prop: 'qualityResult',
|
|
|
|
|
+ slot: 'qualityResult',
|
|
|
label: '质检结果',
|
|
label: '质检结果',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
width: 100
|
|
width: 100
|
|
@@ -383,6 +397,41 @@
|
|
|
return { ...res, list: item };
|
|
return { ...res, list: item };
|
|
|
});
|
|
});
|
|
|
return result;
|
|
return result;
|
|
|
|
|
+ } else if (this.selectedDime == 4) {
|
|
|
|
|
+ const params = {
|
|
|
|
|
+ categoryLevelId: treeId,
|
|
|
|
|
+ ...where,
|
|
|
|
|
+ ...order,
|
|
|
|
|
+ dimension: dimension
|
|
|
|
|
+ };
|
|
|
|
|
+ const data = ouint.getMaterielDetails({
|
|
|
|
|
+ ...params,
|
|
|
|
|
+ pageNum: page,
|
|
|
|
|
+ size: limit
|
|
|
|
|
+ });
|
|
|
|
|
+ const result = data.then((res) => {
|
|
|
|
|
+ const data = res.list.map((item) => {
|
|
|
|
|
+ return {
|
|
|
|
|
+ ...item,
|
|
|
|
|
+ minUnit: item.packingUnit,
|
|
|
|
|
+ paths: item.pathName,
|
|
|
|
|
+ availableCountBase: 1,
|
|
|
|
|
+ packingCountBase: 1,
|
|
|
|
|
+ materialCode: item.code,
|
|
|
|
|
+ batchNum: item.batchNo,
|
|
|
|
|
+ qualityResult:
|
|
|
|
|
+ typeof item.qualityResult != 'number'
|
|
|
|
|
+ ? 3
|
|
|
|
|
+ : item.qualityResult,
|
|
|
|
|
+ qualityStatus:
|
|
|
|
|
+ typeof item.qualityStatus != 'number' ? 3 : item.qualityStatus
|
|
|
|
|
+ };
|
|
|
|
|
+ });
|
|
|
|
|
+ console.log(data);
|
|
|
|
|
+ return { ...res, list: data };
|
|
|
|
|
+ });
|
|
|
|
|
+ console.log(result);
|
|
|
|
|
+ return result;
|
|
|
} else {
|
|
} else {
|
|
|
const params = {
|
|
const params = {
|
|
|
categoryLevelId: treeId,
|
|
categoryLevelId: treeId,
|