From e31ab3b7cfdb7705c21effab4a1a407a6d580ee6 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 5 Jan 2024 18:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/firstReport/index.vue   |   2 +-
 src/views/quality/incomeReport/index.vue  | 130 ++++++++++++----------
 src/views/quality/produceReport/index.vue |  21 ++--
 3 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/src/views/quality/firstReport/index.vue b/src/views/quality/firstReport/index.vue
index 2fb0c1c0..68341b25 100644
--- a/src/views/quality/firstReport/index.vue
+++ b/src/views/quality/firstReport/index.vue
@@ -142,7 +142,7 @@
 					</el-row>
 					<el-row>
 						<el-col :offset="8" :span="8">
-							<h3 style="align-content: center;">（黑蚊香）首检确认表</h3>
+							<h2 style="align-content: center;">（黑蚊香）首检确认表</h2>
 						</el-col>
 					</el-row>
 					<el-row>
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index f32b9161..9d89cf9e 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -134,124 +134,108 @@
 			</el-row>
 			<!-- 打印整个printFrom区域 -->
 			<div id="printFrom">
-				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 					<el-row>
-						<el-col :span="8">
-							<el-form-item label="OEM厂名" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请输入OEM厂名" disabled/>
-							</el-form-item>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h2>白坯检验报告</h2>
+						</el-col>
+					</el-row>
+					<el-row>
 						<el-col :span="8">
 							<el-form-item label="来料类别" prop="factoryCode">
-								<el-input v-model="form.factoryCode" placeholder="请输入来料类别" disabled/>
+								<el-input v-model="form.factoryCode" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="生产批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
+								<el-input v-model="form.incomeBatchNo" disabled/>
 							</el-form-item>
 						</el-col>
+						<el-col :span="8">
+							<el-form-item label="报告编号" prop="checkNo">
+								<el-input v-model="form.checkNo" disabled />
+							 </el-form-item>
+						 </el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8">
-							<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-input v-model="form.materialName" placeholder="请选择物料名称" disabled />
+								<el-input v-model="form.materialName" disabled />
 							 </el-form-item>
 						 </el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="8">	
-							<el-form-item label="供应商编码" prop="supplierCode">
-								<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
+						 <el-col :span="8">
+							<el-form-item label="物料编码" prop="materialCode">
+								<el-input v-model="form.materialCode" disabled />
 							</el-form-item>
 						</el-col>
+					</el-row>
+					<el-row>
 						<el-col :span="16">
 							<el-form-item label="供应单位" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请选择供应商名称" disabled/>
+								<el-input v-model="form.supplierName" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">	
+							<el-form-item label="供应编码" prop="supplierCode">
+								<el-input v-model="form.supplierCode" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">	
 							<el-form-item label="来料数量" prop="quality">
-								<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
+								<el-input type="number" v-model="form.quality" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="单位" prop="unit" >
-								<el-input v-model="form.unit" placeholder="请输入单位" disabled/>
+								<el-input v-model="form.unit" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="物料来源" prop="checkType" >
-								<el-input v-model="form.checkType" placeholder="物料来源" disabled/>
-								<!-- <el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
-									<el-option
-										v-for="dict in checkTypes"
-										:key="dict.id"
-										:label="dict.checkName"
-										:value="dict.id"
-									></el-option>
-								</el-select> -->
+								<el-input v-model="form.checkType" disabled/>
 							</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-input v-model="form.sampleQuality" 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>
+								<el-input v-model="form.createTime" 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">
-								<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
+								<el-input v-model="form.checkTime" 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="checkNo">
-								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
-							</el-form-item>
-						</el-col> -->
-						<el-col :span="8">
-							<el-form-item label="产品提报人" prop="checkManName">
-								<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
-							</el-form-item>
-						</el-col>
 					</el-row>	
 					<el-row>
 						<el-col :span="24">	
 							<!-- 检验项目明细 -->
 							<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" type="index" width="50"/>
 								<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="sampleNum" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
-								<el-table-column label="实测结果" align="center" prop="actualValue" width="200"/>
+								<el-table-column label="实测结果" align="center" prop="actualValue" width="300"/>
 								<el-table-column label="判定" align="center" prop="status" >
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
@@ -259,7 +243,36 @@
 								</el-table-column>	
 							</el-table>
 						</el-col>
-					</el-row>	
+					</el-row>
+					<el-row>
+						<el-col>
+							<el-form-item label="综合检验结论" prop="checkManName">
+								<el-col offset="6" span="6">
+									<el-checkbox disabled>合格</el-checkbox>
+								</el-col>
+								<el-col offset="3" span="6">
+									<el-checkbox disabled>不合格</el-checkbox>
+								</el-col>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="品管经理/主任：" label-width="120PX">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="品质主管：">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="品管员：" prop="checkManName">
+								<el-input v-model="form.checkManName" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
 				</el-form>
 			</div>
 			
@@ -526,7 +539,7 @@ export default {
 			printJS({
 				printable: params.printable, // 'printFrom', // 标签元素id
 				type: params.type || 'html',
-				maxWidth: 1500, // 最大宽度
+				maxWidth: 1600, // 最大宽度
 				font_size: "",// 设置字体大小
 				header: "来料检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
@@ -543,4 +556,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
+.center-text {  
+	text-align: center;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 16830274..b72f1fca 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -56,16 +56,6 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<!-- <el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['quality:qcIncome:add']"
-				>新增</el-button>
-			</el-col> -->
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -267,13 +257,13 @@
 			<div id="firstReportPrint">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="8" :span="8">
-							<h1 style="align-content: center;">中山榄菊日化实业有限公司</h1>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :offset="8" :span="8">
-							<h3 style="align-content: center;">（黑蚊香）首检确认表</h3>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h2>（黑蚊香）首检确认表</h2>
 						</el-col>
 					</el-row>
 					<el-row>
@@ -659,4 +649,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
+.center-text {  
+  text-align: center;
+}
 </style>
\ No newline at end of file