From fd7edcd57984fa7e481028c2d8b39050ccd7319e Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 8 Jan 2024 10:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/incomeReport/index.vue  | 12 ++---
 src/views/quality/produceReport/index.vue |  6 +--
 src/views/quality/productReport/index.vue | 66 +++++++++++------------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index 9d89cf9..792d838 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -120,7 +120,7 @@
 		/>
 
 		<!-- 打印来料检验对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
 					<el-button 
@@ -136,7 +136,7 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 					<el-row>
-						<el-col :offset="8" :span="8" class="center-text">
+						<el-col :offset="7" :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -246,7 +246,7 @@
 					</el-row>
 					<el-row>
 						<el-col>
-							<el-form-item label="综合检验结论" prop="checkManName">
+							<el-form-item label="综合检验结论" prop="checkManName" label-width="100px">
 								<el-col offset="6" span="6">
 									<el-checkbox disabled>合格</el-checkbox>
 								</el-col>
@@ -258,12 +258,12 @@
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							<el-form-item label="品管经理/主任：" label-width="120PX">
+							<el-form-item label="品管经理/主任：" label-width="120px">
 								<el-input disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="品质主管：">
+							<el-form-item label="品质主管：" label-width="100px">
 								<el-input disabled/>
 							</el-form-item>
 						</el-col>
@@ -541,7 +541,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1600, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: "来料检验结果报告",//params.header, // '表单',
+				//header: "来料检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index b72f1fc..00245fb 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -241,7 +241,7 @@
 		</el-dialog>
 
 		<!-- 打印首检对话框 -->
-		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1200px" append-to-body>
+		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
 					<el-button 
@@ -257,7 +257,7 @@
 			<div id="firstReportPrint">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="8" :span="8" class="center-text">
+						<el-col :offset="7" :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -630,7 +630,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: "生产过程检验结果报告",//params.header, // '表单',
+				//header: "生产过程检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index bdea3a6..a2d6249 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -120,7 +120,7 @@
 		/>
 
 		<!-- 打印成品检验对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
 					<el-button 
@@ -136,85 +136,82 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<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>
-						<el-col :span="8">
-							<el-form-item label="来料类别" prop="factoryCode">
-								<el-input v-model="form.factoryCode" placeholder="请输入检验任务编号" disabled/>
-							</el-form-item>
+						<el-col :offset="7" :span="10" class="center-text">
+							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
-						<el-col :span="8">
-							<el-form-item label="生产批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" placeholder="请输入生产批号" disabled/>
-							</el-form-item>
+					</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="materialCode">
-								<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
+								<el-input v-model="form.materialCode" 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="factoryCode">
+								<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" 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-input v-model="form.supplierCode" disabled/>
 							</el-form-item>
 						</el-col>
 						<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-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="checkLoc">
-								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
+								<el-input v-model="form.checkNo" 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-input v-model="form.checkManName" 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-input v-model="form.checkNo" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -529,7 +526,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: "成品入库检验结果报告",//params.header, // '表单',
+				//header: "成品入库检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
@@ -544,4 +541,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
+.center-text {  
+  text-align: center;
+}
 </style>
\ No newline at end of file