|
@@ -4,7 +4,7 @@
|
|
|
<ele-pro-table
|
|
<ele-pro-table
|
|
|
ref="table"
|
|
ref="table"
|
|
|
:columns="columns"
|
|
:columns="columns"
|
|
|
- :datasource="poList.filter((item) => item.disposalStatus != 2)"
|
|
|
|
|
|
|
+ :datasource="isView?poList:poList.filter((item) => item.disposalStatus != 2)"
|
|
|
:selection.sync="selection"
|
|
:selection.sync="selection"
|
|
|
:needPage="false"
|
|
:needPage="false"
|
|
|
row-key="id"
|
|
row-key="id"
|
|
@@ -37,68 +37,68 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<template v-slot:badTypeName="{ row, $index }">
|
|
<template v-slot:badTypeName="{ row, $index }">
|
|
|
- <el-select
|
|
|
|
|
- v-model="row.badTypeId"
|
|
|
|
|
- placeholder="请选择不良类型"
|
|
|
|
|
- size="small"
|
|
|
|
|
- style="width: 100%"
|
|
|
|
|
- remote
|
|
|
|
|
- filterable
|
|
|
|
|
- clearable
|
|
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="row.badTypeId"
|
|
|
|
|
+ placeholder="请选择不良类型"
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ remote
|
|
|
|
|
+ filterable
|
|
|
|
|
+ clearable
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in badTypeList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ @click="row.badTypeName = item.name"
|
|
|
>
|
|
>
|
|
|
- <el-option
|
|
|
|
|
- v-for="item in badTypeList"
|
|
|
|
|
- :key="item.id"
|
|
|
|
|
- :label="item.name"
|
|
|
|
|
- :value="item.id"
|
|
|
|
|
- @click="row.badTypeName = item.name"
|
|
|
|
|
- >
|
|
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<template v-slot:badNameName="{ row, $index }">
|
|
<template v-slot:badNameName="{ row, $index }">
|
|
|
- <el-select
|
|
|
|
|
- v-model="row.badNameId"
|
|
|
|
|
- placeholder="请选择不良名称"
|
|
|
|
|
- size="small"
|
|
|
|
|
- style="width: 100%"
|
|
|
|
|
- remote
|
|
|
|
|
- filterable
|
|
|
|
|
- clearable
|
|
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="row.badNameId"
|
|
|
|
|
+ placeholder="请选择不良名称"
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ remote
|
|
|
|
|
+ filterable
|
|
|
|
|
+ clearable
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in badNameList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ @click="row.badNameName = item.name"
|
|
|
>
|
|
>
|
|
|
- <el-option
|
|
|
|
|
- v-for="item in badNameList"
|
|
|
|
|
- :key="item.id"
|
|
|
|
|
- :label="item.name"
|
|
|
|
|
- :value="item.id"
|
|
|
|
|
- @click="row.badNameName = item.name"
|
|
|
|
|
- >
|
|
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-slot:reasonTypeName="{ row, $index }">
|
|
<template v-slot:reasonTypeName="{ row, $index }">
|
|
|
- <el-select
|
|
|
|
|
- v-model="row.reasonTypeId"
|
|
|
|
|
- placeholder="请选择原因类型"
|
|
|
|
|
- size="small"
|
|
|
|
|
- style="width: 100%"
|
|
|
|
|
- remote
|
|
|
|
|
- filterable
|
|
|
|
|
- clearable
|
|
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="row.reasonTypeId"
|
|
|
|
|
+ placeholder="请选择原因类型"
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ remote
|
|
|
|
|
+ filterable
|
|
|
|
|
+ clearable
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in reasonTypeList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ @click="row.reasonTypeName = item.name"
|
|
|
>
|
|
>
|
|
|
- <el-option
|
|
|
|
|
- v-for="item in reasonTypeList"
|
|
|
|
|
- :key="item.id"
|
|
|
|
|
- :label="item.name"
|
|
|
|
|
- :value="item.id"
|
|
|
|
|
- @click="row.reasonTypeName = item.name"
|
|
|
|
|
- >
|
|
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-slot:unqualifiedReason="{ row, $index }">
|
|
<template v-slot:unqualifiedReason="{ row, $index }">
|
|
|
- <el-input v-model="row.unqualifiedReason"></el-input>
|
|
|
|
|
|
|
+ <el-input v-model="row.unqualifiedReason"></el-input>
|
|
|
</template>
|
|
</template>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
|
</el-card>
|
|
</el-card>
|
|
@@ -496,14 +496,14 @@
|
|
|
value: 5,
|
|
value: 5,
|
|
|
label: '让步接收'
|
|
label: '让步接收'
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- value: 6,
|
|
|
|
|
- label: '留样'
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- value: 7,
|
|
|
|
|
- label: '消耗'
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // value: 6,
|
|
|
|
|
+ // label: '留样'
|
|
|
|
|
+ // },
|
|
|
|
|
+ // {
|
|
|
|
|
+ // value: 7,
|
|
|
|
|
+ // label: '消耗'
|
|
|
|
|
+ // },
|
|
|
{
|
|
{
|
|
|
value: 8,
|
|
value: 8,
|
|
|
label: '回用'
|
|
label: '回用'
|
|
@@ -778,11 +778,11 @@
|
|
|
setQualifiedNumber() {
|
|
setQualifiedNumber() {
|
|
|
let isQualifiedNumber = true;
|
|
let isQualifiedNumber = true;
|
|
|
let noQualifiedNumber = this.poList
|
|
let noQualifiedNumber = this.poList
|
|
|
- .filter((item) => item.disposeType != 5 && item.disposalStatus != 2)
|
|
|
|
|
|
|
+ .filter((item) => ![5,6,7].includes(item.disposeType))
|
|
|
.reduce((acc, cur) => acc + cur.measureQuantity, 0);
|
|
.reduce((acc, cur) => acc + cur.measureQuantity, 0);
|
|
|
|
|
|
|
|
console.log(
|
|
console.log(
|
|
|
- this.poList.map((item) => item.measureQuantity),
|
|
|
|
|
|
|
+ noQualifiedNumber,
|
|
|
'noQualifiedNumber'
|
|
'noQualifiedNumber'
|
|
|
);
|
|
);
|
|
|
|
|
|
|
@@ -968,13 +968,13 @@
|
|
|
processedList.forEach((sampleItem) => {
|
|
processedList.forEach((sampleItem) => {
|
|
|
if (sampleItem.disposeType == 6) {
|
|
if (sampleItem.disposeType == 6) {
|
|
|
sampleItem.qualityResults == 2
|
|
sampleItem.qualityResults == 2
|
|
|
- ? (this.retainedSampleQuantity += sampleItem.measureQuantity)
|
|
|
|
|
- : (this.retainedSampleUnqualified +=
|
|
|
|
|
|
|
+ ? (this.retainedSampleUnqualified += sampleItem.measureQuantity)
|
|
|
|
|
+ : (this.retainedSampleQuantity +=
|
|
|
sampleItem.measureQuantity);
|
|
sampleItem.measureQuantity);
|
|
|
} else {
|
|
} else {
|
|
|
sampleItem.qualityResults == 2
|
|
sampleItem.qualityResults == 2
|
|
|
- ? (this.lossNumber += sampleItem.measureQuantity)
|
|
|
|
|
- : (this.lossNumberUnqualified += sampleItem.measureQuantity);
|
|
|
|
|
|
|
+ ? (this.lossNumberUnqualified += sampleItem.measureQuantity)
|
|
|
|
|
+ : (this.lossNumber += sampleItem.measureQuantity);
|
|
|
}
|
|
}
|
|
|
const inventoryItem = this.inventoryList.find(
|
|
const inventoryItem = this.inventoryList.find(
|
|
|
(item) => item.sourceId === sampleItem.sourceId
|
|
(item) => item.sourceId === sampleItem.sourceId
|