From 35964e13afbfbd25c5ff90b147acb37f31b47c52 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 19 Jan 2024 17:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=B1=95=E7=A4=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/produceReport/index.vue | 33 +++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

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