|
|
|
@ -134,7 +134,7 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :offset="8" :span="8" class="center-text">
|
|
|
|
|
<el-col :span="8" class="center-text">
|
|
|
|
|
<h2>成品检验报告</h2>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
@ -164,7 +164,7 @@
|
|
|
|
|
<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
|
|
|
|
|
<!--<el-table-column label="单位" align="center" prop="unitCode" width="50"/>-->
|
|
|
|
|
<el-table-column label="实测结果及判定" align="center">
|
|
|
|
|
<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
|
|
|
|
|
<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
|
|
|
|
|
<el-table-column label="判定" align="center" prop="status" width="110"/>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!--
|
|
|
|
@ -206,19 +206,13 @@
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-descriptions title="" border :column="1">
|
|
|
|
|
<el-descriptions-item label="综合检验结论">
|
|
|
|
|
|
|
|
|
|
<el-col offset="1" span="6">
|
|
|
|
|
<el-checkbox-group v-model="form.checkedValues">
|
|
|
|
|
<el-checkbox label="Y">合格</el-checkbox>
|
|
|
|
|
<el-checkbox label="N">不合格</el-checkbox>
|
|
|
|
|
</el-checkbox-group>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<span v-if="this.checkResult=='Y'">√合格</span>
|
|
|
|
|
<span label="N" v-else>×不合格</span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col span="8">
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
判定合格打“√”,不合格打“×”
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-descriptions-item>
|
|
|
|
|
</el-descriptions>
|
|
|
|
|
<!--
|
|
|
|
@ -279,6 +273,7 @@ export default {
|
|
|
|
|
//打印
|
|
|
|
|
formRef: 'form',
|
|
|
|
|
validateRules: [],
|
|
|
|
|
checkResult: 'Y',
|
|
|
|
|
printData: {
|
|
|
|
|
printable: 'printFrom',
|
|
|
|
|
ignore: ['no-print'],
|
|
|
|
@ -296,6 +291,7 @@ export default {
|
|
|
|
|
incomeList: [],
|
|
|
|
|
// 检验项目列表
|
|
|
|
|
checkProjectList: [],
|
|
|
|
|
checkProjectList0:[],
|
|
|
|
|
defectList: [],
|
|
|
|
|
// 弹出层标题
|
|
|
|
|
title: "",
|
|
|
|
@ -470,9 +466,9 @@ export default {
|
|
|
|
|
this.queryParams.recordId = recordId;
|
|
|
|
|
getProduct(recordId).then(response => {
|
|
|
|
|
this.form = response.data;
|
|
|
|
|
let checkedValues0 =[];
|
|
|
|
|
checkedValues0.push(response.data.checkResult)
|
|
|
|
|
this.form.checkedValues = checkedValues0;
|
|
|
|
|
//let checkedValues0 =[];
|
|
|
|
|
this.checkResult = response.data.checkResult;
|
|
|
|
|
//this.form.checkedValues = checkedValues0;
|
|
|
|
|
this.form.printable = 'printFrom'; //打印时需要
|
|
|
|
|
this.form.ignore = ['no-print'];//打印时需要
|
|
|
|
|
this.open = true;
|
|
|
|
@ -534,6 +530,8 @@ export default {
|
|
|
|
|
item.status = '合格';
|
|
|
|
|
}else if(item.status == 'N'){
|
|
|
|
|
item.status = '不合格';
|
|
|
|
|
}else if(item.status == '未检验'){
|
|
|
|
|
item.status = '未检验';
|
|
|
|
|
}else{
|
|
|
|
|
item.status = '/';
|
|
|
|
|
}
|
|
|
|
|