|
@@ -7,7 +7,7 @@
|
|
|
<el-table-column type="expand">
|
|
<el-table-column type="expand">
|
|
|
<template slot-scope="props">
|
|
<template slot-scope="props">
|
|
|
<div style="padding: 10px;">
|
|
<div style="padding: 10px;">
|
|
|
- <el-table :data="props.row.qualitySampleTemplateList" border >
|
|
|
|
|
|
|
+ <el-table :data="props.row.qualitySampleTemplateList" border>
|
|
|
<el-table-column label="质检方案编码" prop="qualitySchemeTemplateCode" align="center">
|
|
<el-table-column label="质检方案编码" prop="qualitySchemeTemplateCode" align="center">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="质检方案名称" prop="qualitySchemeTemplateName"
|
|
<el-table-column label="质检方案名称" prop="qualitySchemeTemplateName"
|
|
@@ -41,12 +41,14 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<template v-for="column in tableColumns">
|
|
<template v-for="column in tableColumns">
|
|
|
<el-table-column :label="column.label" :prop="column.prop" :fixed="column.fixed"
|
|
<el-table-column :label="column.label" :prop="column.prop" :fixed="column.fixed"
|
|
|
- :show-overflow-tooltip="true" :width="column.width" :align="column.align" :formatter="column.formatter">
|
|
|
|
|
|
|
+ :show-overflow-tooltip="true" :width="column.width" :align="column.align"
|
|
|
|
|
+ :formatter="column.formatter">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</template>
|
|
</template>
|
|
|
<el-table-column label="操作" align="center" width="80">
|
|
<el-table-column label="操作" align="center" width="80">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
- <el-link :underline="false" type="primary" @click="handleDispose(scope.$index, scope.row, 'dispose')">
|
|
|
|
|
|
|
+ <el-link :underline="false" type="primary"
|
|
|
|
|
+ @click="handleDispose(scope.$index, scope.row, 'dispose')">
|
|
|
处置
|
|
处置
|
|
|
</el-link>
|
|
</el-link>
|
|
|
</template>
|
|
</template>
|
|
@@ -101,12 +103,13 @@ export default {
|
|
|
{ label: '重量', prop: 'weight', align: 'center' },
|
|
{ label: '重量', prop: 'weight', align: 'center' },
|
|
|
{ label: '重量单位', prop: 'weightUnit', align: 'center' },
|
|
{ label: '重量单位', prop: 'weightUnit', align: 'center' },
|
|
|
{ label: '仓库', prop: 'warehouseName', align: 'center', },
|
|
{ label: '仓库', prop: 'warehouseName', align: 'center', },
|
|
|
- { label: '质检结果', prop: 'qualityResults', align: 'center',formatter: (row, column) => {
|
|
|
|
|
- if(row.qualityResults){
|
|
|
|
|
- return row.qualityResults==1?'合格':row.qualityResults==2?'不合格':row.qualityResults==3?'让步接收':'';
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ label: '质检结果', prop: 'qualityResults', align: 'center', formatter: (row, column) => {
|
|
|
|
|
+ if (row.qualityResults) {
|
|
|
|
|
+ return row.qualityResults == 1 ? '合格' : row.qualityResults == 2 ? '不合格' : row.qualityResults == 3 ? '让步接收' : '';
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ },
|
|
|
// { label: '货区', prop: 'areaName', align: 'center', },
|
|
// { label: '货区', prop: 'areaName', align: 'center', },
|
|
|
// { label: '货架', prop: 'goodsShelfName', align: 'center', },
|
|
// { label: '货架', prop: 'goodsShelfName', align: 'center', },
|
|
|
// { label: '货位', prop: 'goodsAllocationName', align: 'center', },
|
|
// { label: '货位', prop: 'goodsAllocationName', align: 'center', },
|
|
@@ -134,10 +137,11 @@ export default {
|
|
|
|
|
|
|
|
created() { },
|
|
created() { },
|
|
|
methods: {
|
|
methods: {
|
|
|
- async openDia(index, row, type, list,isStatus) {
|
|
|
|
|
- this.tableData = [];
|
|
|
|
|
|
|
+ async openDia(index, row, type, list, isStatus) {
|
|
|
|
|
+ this.tableData = [];
|
|
|
this.rowIndex = index
|
|
this.rowIndex = index
|
|
|
this.type = type;
|
|
this.type = type;
|
|
|
|
|
+ console.log(list, 'lklllllllllllllllllkkkkkkkkkkkkkkkkkkkkk');
|
|
|
this.tableData = list;
|
|
this.tableData = list;
|
|
|
|
|
|
|
|
this.visible = true;
|
|
this.visible = true;
|
|
@@ -149,9 +153,9 @@ export default {
|
|
|
this.visible = false;
|
|
this.visible = false;
|
|
|
this.$emit('handleConfirm', this.tableData, this.rowIndex);
|
|
this.$emit('handleConfirm', this.tableData, this.rowIndex);
|
|
|
},
|
|
},
|
|
|
- handleDispose(index, row, type) {
|
|
|
|
|
- this.$emit('handleDispose', index, row, type);
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ handleDispose(index, row, type) {
|
|
|
|
|
+ this.$emit('handleDispose', index, row, type);
|
|
|
|
|
+ },
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
</script>
|
|
</script>
|