From c54cc8ee515fa1d6b4d742a701ee8be622cb5d6b Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Wed, 27 Dec 2023 09:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/incomeReport/index.vue  | 48 +++++++++++++++------
 src/views/quality/produceReport/index.vue |  2 +-
 src/views/quality/productReport/index.vue | 52 ++++++++++++++++-------
 3 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index e5964507..f32b9161 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -83,7 +83,7 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
-			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
@@ -119,7 +119,7 @@
 			@pagination="getList"
 		/>
 
-		<!-- 添加或修改来料检验对话框 -->
+		<!-- 打印来料检验对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
 			<el-row>
 				<el-col :span="20">
@@ -143,18 +143,18 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="来料类别" prop="factoryCode">
-								<el-input v-model="form.factoryCode" placeholder="请输入检验任务编号" disabled/>
+								<el-input v-model="form.factoryCode" placeholder="请输入来料类别" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="来料批号" prop="incomeBatchNo">
+							<el-form-item label="生产批号" prop="incomeBatchNo">
 								<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							   <el-form-item label="物料编码" prop="materialCode">
+							<el-form-item label="物料编码" prop="materialCode">
 								<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
 							</el-form-item>
 						</el-col>
@@ -171,14 +171,14 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="16">
-							<el-form-item label="供应商名称" prop="supplierName">
+							<el-form-item label="供应单位" prop="supplierName">
 								<el-input v-model="form.supplierName" placeholder="请选择供应商名称" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">	
-							<el-form-item label="物料数量" prop="quality">
+							<el-form-item label="来料数量" prop="quality">
 								<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
 							</el-form-item>
 						</el-col>
@@ -201,6 +201,25 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="抽检数量" prop="sampleQuality">
+								<el-input v-model="form.sampleQuality" placeholder="请选择抽样数量" disabled />
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="报告编号" prop="checkNo">
+								<el-input v-model="form.checkNo" placeholder="请选择报告编号" disabled />
+							 </el-form-item>
+						 </el-col>
+						 <el-col :span="8">
+							<el-form-item label="报检日期" prop="createTime">
+								<el-input v-model="form.createTime" placeholder="请输入报检日期" disabled>
+									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+								</el-input>
+							</el-form-item>
+						</el-col>
+					</el-row>
 					<el-row>
 						<el-col :span="8">
 							<el-form-item label="检验日期" prop="checkTime">
@@ -209,11 +228,11 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="8">
+						<!-- <el-col :span="8">
 							<el-form-item label="检验编号" prop="checkNo">
 								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
 							</el-form-item>
-						</el-col>
+						</el-col> -->
 						<el-col :span="8">
 							<el-form-item label="产品提报人" prop="checkManName">
 								<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
@@ -225,14 +244,15 @@
 							<!-- 检验项目明细 -->
 							<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" />
+								<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="upperDiff" />
 								<el-table-column label="下差值" align="center" prop="downDiff" />
+								<el-table-column label="抽检数量" align="center" prop="sampleNum" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
-								<el-table-column label="检验值" align="center" prop="actualValue" />
-								<el-table-column label="结果" align="center" prop="status" >
+								<el-table-column label="实测结果" align="center" prop="actualValue" width="200"/>
+								<el-table-column label="判定" align="center" prop="status" >
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 91180bef..2cba9c88 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -83,7 +83,7 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
-			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 2b0b0db6..bdea3a61 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -83,7 +83,7 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
-			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
@@ -119,7 +119,7 @@
 			@pagination="getList"
 		/>
 
-		<!-- 添加或修改来料检验对话框 -->
+		<!-- 打印成品检验对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
 			<el-row>
 				<el-col :span="20">
@@ -147,19 +147,19 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="来料批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
+							<el-form-item label="生产批号" prop="incomeBatchNo">
+								<el-input v-model="form.incomeBatchNo" placeholder="请输入生产批号" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							   <el-form-item label="物料编码" prop="materialCode">
+							   <el-form-item label="产品编码" prop="materialCode">
 								<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
 							</el-form-item>
 						</el-col>
 						<el-col :span="16">
-							<el-form-item label="物料名称" prop="materialName">
+							<el-form-item label="产品名称" prop="materialName">
 								<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled />
 							 </el-form-item>
 						 </el-col>
@@ -178,7 +178,7 @@
 					</el-row>
 					<el-row>
 						<el-col :span="8">	
-							<el-form-item label="物料数量" prop="quality">
+							<el-form-item label="生产数量" prop="quality">
 								<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
 							</el-form-item>
 						</el-col>
@@ -203,10 +203,13 @@
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							<el-form-item label="检验日期" prop="checkTime">
-								<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
-									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-								</el-input>
+							<el-form-item label="抽样地点" prop="checkLoc">
+								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="检验依据" prop="checkNo">
+								<el-input v-model="form.checkManName" placeholder="请输入检验依据" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -214,6 +217,22 @@
 								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
 							</el-form-item>
 						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="报检日期" prop="createTime">
+								<el-input v-model="form.checkTime" placeholder="请输入报检日期" disabled>
+									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="检验日期" prop="checkTime">
+								<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
+									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+								</el-input>
+							</el-form-item>
+						</el-col>
 						<el-col :span="8">
 							<el-form-item label="产品提报人" prop="checkManName">
 								<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
@@ -225,14 +244,15 @@
 							<!-- 检验项目明细 -->
 							<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" />
+								<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="upperDiff" />
 								<el-table-column label="下差值" align="center" prop="downDiff" />
+								<el-table-column label="抽检数量" align="center" prop="sampleNum" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
-								<el-table-column label="检验值" align="center" prop="actualValue" />
-								<el-table-column label="结果" align="center" prop="status" >
+								<el-table-column label="实测结果" align="center" prop="actualValue" width="200"/>
+								<el-table-column label="判定" align="center" prop="status" >
 									<template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>