|
@@ -476,11 +476,13 @@
|
|
|
v-show="!row.isPack"
|
|
v-show="!row.isPack"
|
|
|
/>
|
|
/>
|
|
|
<span v-if="row.isPack">{{
|
|
<span v-if="row.isPack">{{
|
|
|
- row.result == 0
|
|
|
|
|
- ? '合格'
|
|
|
|
|
- : row.result == 1
|
|
|
|
|
- ? '不合格'
|
|
|
|
|
- : '让步接收'
|
|
|
|
|
|
|
+ row.result
|
|
|
|
|
+ ? row.result == 0
|
|
|
|
|
+ ? '合格'
|
|
|
|
|
+ : row.result == 1
|
|
|
|
|
+ ? '不合格'
|
|
|
|
|
+ : '让步接收'
|
|
|
|
|
+ : ''
|
|
|
}}</span>
|
|
}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -492,9 +494,11 @@
|
|
|
v-model="row.status"
|
|
v-model="row.status"
|
|
|
v-show="!row.isPack"
|
|
v-show="!row.isPack"
|
|
|
/>
|
|
/>
|
|
|
- <span v-if="row.isPack">{{
|
|
|
|
|
- row.status == 0 ? '未检' : '已检'
|
|
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ <span v-if="row.isPack">
|
|
|
|
|
+ <span v-if="!row.status"></span>
|
|
|
|
|
+ <span v-if="row.status == 0">未检</span>
|
|
|
|
|
+ <span v-else>已检</span>
|
|
|
|
|
+ </span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
|
@@ -606,17 +610,23 @@
|
|
|
<el-table-column label="质检结果" prop="result" width="120">
|
|
<el-table-column label="质检结果" prop="result" width="120">
|
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
|
<span>{{
|
|
<span>{{
|
|
|
- row.result == 0
|
|
|
|
|
- ? '合格'
|
|
|
|
|
- : row.result == 1
|
|
|
|
|
- ? '不合格'
|
|
|
|
|
- : '让步接收'
|
|
|
|
|
|
|
+ row.result
|
|
|
|
|
+ ? row.result == 0
|
|
|
|
|
+ ? '合格'
|
|
|
|
|
+ : row.result == 1
|
|
|
|
|
+ ? '不合格'
|
|
|
|
|
+ : '让步接收'
|
|
|
|
|
+ : ''
|
|
|
}}</span>
|
|
}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="质检状态" prop="status" width="120">
|
|
<el-table-column label="质检状态" prop="status" width="120">
|
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
|
- <span>{{ row.status == 0 ? '未检' : '已检' }}</span>
|
|
|
|
|
|
|
+ <span
|
|
|
|
|
+ ><span v-if="!row.status"></span>
|
|
|
|
|
+ <span v-if="row.status == 0">未检</span>
|
|
|
|
|
+ <span v-else>已检</span></span
|
|
|
|
|
+ >
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
@@ -879,6 +889,7 @@
|
|
|
//包装编辑
|
|
//包装编辑
|
|
|
packEdit(row, index) {
|
|
packEdit(row, index) {
|
|
|
console.log('row', row);
|
|
console.log('row', row);
|
|
|
|
|
+ console.log('this.detailList', this.detailList);
|
|
|
this.$set(row, 'isPack', false);
|
|
this.$set(row, 'isPack', false);
|
|
|
this.$set(row, 'result', row.result ? row.result.toString() : '');
|
|
this.$set(row, 'result', row.result ? row.result.toString() : '');
|
|
|
this.$set(row, 'status', row.status ? row.status.toString() : '');
|
|
this.$set(row, 'status', row.status ? row.status.toString() : '');
|