|
|
@ -270,10 +270,9 @@
|
|
|
|
<!-- 检验项目明细 -->
|
|
|
|
<!-- 检验项目明细 -->
|
|
|
|
<el-table v-loading="loading" :data="checkProjectList" >
|
|
|
|
<el-table v-loading="loading" :data="checkProjectList" >
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
<el-table-column label="序号" align="center" type="index" width="100"/>
|
|
|
|
<el-table-column label="序号" align="center" type="index" width="50"/>
|
|
|
|
<el-table-column label="检验项目" align="center" prop="ruleName" />
|
|
|
|
<el-table-column label="检验项目" align="left" prop="ruleName" width="150"/>
|
|
|
|
<el-table-column label="内容" align="center" prop="checkStandard" width="200"/>
|
|
|
|
<el-table-column label="实际检验结果" align="center" prop="propertyCode" width="100">
|
|
|
|
<el-table-column label="实际检验结果" align="center" prop="propertyCode" width="200">
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<dict-tag
|
|
|
|
<dict-tag
|
|
|
|
:options="dict.type.qc_rule_prop"
|
|
|
|
:options="dict.type.qc_rule_prop"
|
|
|
@ -281,9 +280,18 @@
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="判定" align="center" prop="status" >
|
|
|
|
<el-table-column label="测量值" align="center" prop="actualValue" width="100"/>
|
|
|
|
|
|
|
|
<el-table-column label="判定" align="center" prop="status" width="50"
|
|
|
|
|
|
|
|
:formatter="checkStatusFormate"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
<el-table-column label="检验描述" align="center" prop="remark" width="200">
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="附件" align="center" prop="files" width="200">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
|
|
|
|
<el-image v-for="(item,index) in scope.row.files"
|
|
|
|
|
|
|
|
:src="item.fileAddress"
|
|
|
|
|
|
|
|
style="width: 100px; height: 100px"
|
|
|
|
|
|
|
|
:fit="fit" />
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
@ -334,7 +342,7 @@ import { getCheckTypes } from "@/api/quality/qcProduce";
|
|
|
|
import moment from 'moment';
|
|
|
|
import moment from 'moment';
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
name: "Income",
|
|
|
|
name: "Income",
|
|
|
|
dicts: ["unit","check_status","check_result"],
|
|
|
|
dicts: ["unit","check_status","check_result","qc_rule_prop"],
|
|
|
|
data() {
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
// 遮罩层
|
|
|
|
// 遮罩层
|
|
|
@ -429,6 +437,15 @@ export default {
|
|
|
|
this.getCheckTypes();
|
|
|
|
this.getCheckTypes();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//检验结果格式化
|
|
|
|
|
|
|
|
checkStatusFormate(row, column, cellValue){
|
|
|
|
|
|
|
|
if(cellValue == 'Y'){
|
|
|
|
|
|
|
|
return '✓'
|
|
|
|
|
|
|
|
}else if(cellValue == 'N'){
|
|
|
|
|
|
|
|
return '✘'
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
// 生成表头序号
|
|
|
|
// 生成表头序号
|
|
|
|
indexMethod(index) {
|
|
|
|
indexMethod(index) {
|
|
|
|
return index + 1;
|
|
|
|
return index + 1;
|
|
|
|