diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index d14359a..1683027 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -249,7 +249,125 @@
取 消
-
+
+
+
+
+
+ 打印
+
+
+
+
+
+
+
+ 中山榄菊日化实业有限公司
+
+
+
+
+ （黑蚊香）首检确认表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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'; //打印时需要
- this.form.ignore = ['no-print'];//打印时需要
- this.open = true;
- this.title = "查看过程检验报告";
+ 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.getCheckedProjectList();
},
@@ -518,6 +647,10 @@ export default {
properties: params.properties || null
})
},
+ handleDone() {
+ this.firstReportOpen = false;
+ this.reset();
+ },
}
};
diff --git a/src/views/quality/qcProjectType/index.vue b/src/views/quality/qcProjectType/index.vue
index af6a6e1..28314f9 100644
--- a/src/views/quality/qcProjectType/index.vue
+++ b/src/views/quality/qcProjectType/index.vue
@@ -80,6 +80,8 @@
+
+
+
+
+
+
+
+