首件检验修改

src/views/quality/produceReport/index.vue

@@ -250,6 +250,124 @@
 			</div>
 		</el-dialog>
 
+		<!-- 打印首检对话框 -->
+		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1200px" append-to-body>
+			<el-row>
+				<el-col :span="20">
+					<el-button 
+						    class="print-btn"
+							size="mini"
+							type="primary"
+							icon="el-icon-edit"
+							@click="handlePrint(form)"
+						>打印</el-button>
+				</el-col>
+			</el-row>
+			<!-- 打印整个firstReportPrint区域 -->
+			<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>
+					</el-row>
+					<el-row>
+						<el-col :offset="8" :span="8">
+							<h3 style="align-content: center;">（黑蚊香）首检确认表</h3>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :offset="16" :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="16">
+							<el-form-item label="产品名称" prop="materialName">
+								<el-input v-model="form.materialName" disabled />
+							 </el-form-item>
+						 </el-col>
+						<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="8">
+							<el-form-item label="首检日期" prop="checkTime">
+								<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="16">	
+							<el-form-item label="首检原因" >
+								<el-input   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" prop="ruleName" />
+								<el-table-column label="内容" align="center" prop="checkStandard" width="200"/>
+								<el-table-column label="实际检验结果" align="center" prop="propertyCode" width="200">
+									<template slot-scope="scope">
+										<dict-tag
+											:options="dict.type.qc_rule_prop"
+											:value="scope.row.propertyCode"
+										/>
+									</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"/>
+									</template>
+								</el-table-column>	
+							</el-table>
+						</el-col>
+					</el-row>
+					<el-row style="margin-top: 10px;">
+						<el-col :span="20">
+							<el-form-item label="备注：" label-width="160px">
+								<el-input type="textarea" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="20">
+							<el-form-item label="综合结论："  label-width="160px">
+								<el-input type="textarea" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="20">
+							<el-form-item label="车间组长/机管员签名"  label-width="160px">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="20">
+							<el-form-item label="质量管理部品管员签名" prop="checkManName" label-width="160px">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</div>
+			
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="handleDone">确 定</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
@@ -299,6 +417,7 @@ export default {
 			title: "",
 			// 是否显示弹出层
 			open: false,
+			firstReportOpen: false,
 			// 查询参数
 			queryParams: {
 				checkTimeArray: [],
@@ -451,10 +570,20 @@ export default {
 			this.queryParams.recordId = recordId;
 			getProduce(recordId).then(response => {
 				this.form = response.data;
-				this.form.printable = 'printFrom'; //打印时需要
+				if(this.form.checkType =='checkTypeSC') {
+					//首检报告
+					this.form.printable = 'firstReportPrint'; //打印时需要
+					this.form.ignore = ['no-print'];//打印时需要
+					this.firstReportOpen = true;
+					this.title = "首检检验报告";
+				}else {
+					//巡检报告
+					this.form.printable = 'printForm'; //打印时需要
 					this.form.ignore = ['no-print'];//打印时需要
 					this.open = true;
-				this.title = "查看过程检验报告";
+					this.title = "巡检检验报告";
+				}
+				
 			});
 			this.getCheckedProjectList();
 		},
@@ -518,6 +647,10 @@ export default {
 				properties: params.properties || null
 			})
 		},
+		handleDone() {
+			this.firstReportOpen = false;
+			this.reset();
+		},
 	}
 };
 </script>

src/views/quality/qcProjectType/index.vue

@@ -80,6 +80,8 @@
 					</router-link>
 				</template>
 			</el-table-column>
+			<el-table-column label="检验标准编码" align="center" prop="standardNo" />
+			<el-table-column label="版本" align="center" prop="version" />
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -117,6 +119,12 @@
 				<el-form-item label="检测项方案名称" prop="projectTypeName">
 					<el-input v-model="form.projectTypeName" placeholder="请输入检测项方案名称" />
 				</el-form-item>
+				<el-form-item label="检测标准编号" prop="standardNo">
+					<el-input v-model="form.standardNo" placeholder="请输入检测标准编号" />
+				</el-form-item>
+				<el-form-item label="版本" prop="version">
+					<el-input v-model="form.version" placeholder="请输入版本" />
+				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>