|
|
@@ -475,15 +475,12 @@
|
|
|
v-model="row.result"
|
|
|
v-show="!row.isPack"
|
|
|
/>
|
|
|
- <span v-if="row.isPack">{{
|
|
|
- row.result
|
|
|
- ? row.result == 0
|
|
|
- ? '合格'
|
|
|
- : row.result == 1
|
|
|
- ? '不合格'
|
|
|
- : '让步接收'
|
|
|
- : ''
|
|
|
- }}</span>
|
|
|
+ <span v-if="row.isPack">
|
|
|
+ <span v-if="!row.result"></span>
|
|
|
+ <span v-if="row.result == 0">合格</span>
|
|
|
+ <span v-else-if="row.result == 1">不合格</span>
|
|
|
+ <span v-else>让步接收</span>
|
|
|
+ </span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="质检状态" prop="status" width="120">
|
|
|
@@ -609,15 +606,12 @@
|
|
|
|
|
|
<el-table-column label="质检结果" prop="result" width="120">
|
|
|
<template slot-scope="{ row }">
|
|
|
- <span>{{
|
|
|
- row.result
|
|
|
- ? row.result == 0
|
|
|
- ? '合格'
|
|
|
- : row.result == 1
|
|
|
- ? '不合格'
|
|
|
- : '让步接收'
|
|
|
- : ''
|
|
|
- }}</span>
|
|
|
+ <span>
|
|
|
+ <span v-if="!row.result"></span>
|
|
|
+ <span v-if="row.result == 0">合格</span>
|
|
|
+ <span v-else-if="row.result == 1">不合格</span>
|
|
|
+ <span v-else>让步接收</span>
|
|
|
+ </span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="质检状态" prop="status" width="120">
|
|
|
@@ -891,8 +885,16 @@
|
|
|
console.log('row', row);
|
|
|
console.log('this.detailList', this.detailList);
|
|
|
this.$set(row, 'isPack', false);
|
|
|
- this.$set(row, 'result', row.result ? row.result.toString() : '');
|
|
|
- this.$set(row, 'status', row.status ? row.status.toString() : '');
|
|
|
+ this.$set(
|
|
|
+ row,
|
|
|
+ 'result',
|
|
|
+ row.result != null ? row.result.toString() : ''
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ row,
|
|
|
+ 'status',
|
|
|
+ row.status != null ? row.status.toString() : ''
|
|
|
+ );
|
|
|
},
|
|
|
houseData(argum, idx) {
|
|
|
this.$set(this.warehousingMaterialList[idx], 'houseList', argum);
|