成品入库检验报告修改，检验报告logo

src/views/quality/incomeReport/index.vue

@@ -136,7 +136,10 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 					<el-row>
-						<el-col :offset="7" :span="10" class="center-text">
+						<el-col :span="7">
+							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
+						</el-col>
+						<el-col :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -559,4 +562,9 @@ export default {
 .center-text {  
 	text-align: center;
 }
+.report-logo {
+	margin-top: 15px;
+	margin-left: 15px;
+    height: 38px;
+}
 </style>

src/views/quality/produceReport/index.vue

@@ -257,7 +257,10 @@
 			<div id="firstReportPrint">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="7" :span="10" class="center-text">
+						<el-col :span="7">
+							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
+						</el-col>
+						<el-col :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -652,4 +655,9 @@ export default {
 .center-text {  
   text-align: center;
 }
+.report-logo {
+	margin-top: 15px;
+	margin-left: 15px;
+    height: 38px;
+}
 </style>

src/views/quality/productReport/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"
@@ -136,7 +126,10 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="7" :span="10" class="center-text">
+						<el-col :span="7">
+							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
+						</el-col>
+						<el-col :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -146,38 +139,14 @@
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8">
-							   <el-form-item label="产品编码" prop="materialCode">
-								<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" 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-form-item label="产品编码" prop="materialCode">
-								<el-input v-model="form.incomeBatchNo" disabled/>
+								<el-input v-model="form.materialCode" 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" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="16">
-							<el-form-item label="仓库名称" prop="supplierName">
-								<el-input v-model="form.supplierName" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -193,25 +162,25 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="物料来源" prop="checkType" >
+							<el-form-item label="检验编号" prop="checkNo">
-								<el-input v-model="form.checkType" disabled/>
+								<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="checkLoc">
+							<el-form-item label="生产批号" prop="incomeBatchNo">
-								<el-input v-model="form.checkNo" disabled/>
+								<el-input v-model="form.incomeBatchNo" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="检验依据" prop="checkNo">
+							<el-form-item label="抽样地点" prop="checkLoc">
-								<el-input v-model="form.checkManName" disabled/>
+								<el-input v-model="form.checkLoc" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="检验编号" prop="checkNo">
+							<el-form-item label="检验依据" prop="standardNo">
-								<el-input v-model="form.checkNo" disabled/>
+								<el-input v-model="form.standardNo" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -244,8 +213,6 @@
 								<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" width="200"/>
@@ -257,6 +224,37 @@
 							</el-table>
 						</el-col>
 					</el-row>
+					<el-row>
+						<el-col>
+							<el-form-item label="综合检验结论" prop="checkManName" label-width="100px">
+								<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>
+							<el-form-item label="备注：" label-width="120px">
+								<el-input type="textarea" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="16">
+							<el-form-item label="品检主管：" label-width="100px">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="16">
+							<el-form-item label="品管员：" >
+								<el-input  disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
 				</el-form>
 			</div>
 			
@@ -502,6 +500,7 @@ export default {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");
 			}).catch(() => {});
+			
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -544,4 +543,9 @@ export default {
 .center-text {  
   text-align: center;
 }
+.report-logo {
+	margin-top: 15px;
+	margin-left: 15px;
+    height: 38px;
+}
 </style>