From b59ad11f54d28a6b4f9b33e5fb30b55e4b263efb Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 17:31:55 +0800
Subject: [PATCH] bug修复
---
src/views/experiment/checkTheReport/index.vue | 94 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 86 insertions(+), 8 deletions(-)
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index a127c10..b4efda6 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -51,6 +51,19 @@
>
</div>
</div>
+ <el-dialog
+ top="10vh"
+ title="鎶ュ憡棰勮"
+ :visible.sync="dialogVisible"
+ width="60%">
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="printFun()">鎵撳嵃</el-button>
+ </span>
+ <div class="printStyle">
+ <Preview id="printRaw" :reportData="reportData" v-if="reportType===0"></Preview>
+ <TestReport id="printFinished" :reportData="reportData" v-else></TestReport>
+ </div>
+ </el-dialog>
<div class="table-box">
<el-table
ref="reportTable"
@@ -81,14 +94,14 @@
</template></el-table-column
>
<el-table-column
- prop="materialCode"
+ prop="reportCode"
label="鎶ュ憡鍗曞彿"
sortable
min-width="10%"
>
<template slot-scope="scope">
<span style="color: #409eff;">
- {{ scope.row.materialCode }}
+ {{ scope.row.reportCode }}
</span>
</template></el-table-column
>
@@ -143,10 +156,9 @@
<el-button
type="text"
size="small"
- @click="handleClick(scope.row)"
- >棰勮</el-button
+ @click="previewFun(scope.row)"
+ >鏌ョ湅鎶ュ憡</el-button
>
- <el-button type="text" size="small">鎵撳嵃</el-button>
</template>
</el-table-column>
</el-table>
@@ -168,27 +180,81 @@
</template>
<script>
-import { selectAllReport } from "@/api/experiment/checkTheReport";
+import { selectAllReport,getReportData } from "@/api/experiment/checkTheReport";
+import Preview from "@/components/experiment/checkTheReport/index.vue";
+import TestReport from "@/components/experiment/template_testReport/index.vue"
+import PrintJS from 'print-js'
export default {
data() {
return {
+ reportData: [],
+ reportType: 0,
searchData:{
sample_code:'',
reportCode:'',
application_code: ''
},
checkStatus: undefined,
- reportTable: [],
+ reportTable: [
+ {
+ materialCode:'SN23-0517001',
+ reportCode: 'SN23-0517001',
+ inspectionCode: 'SN23-0517001',
+ approver:'榛勫皬鏄�',
+ status: '',
+ conclusion: 1,
+ name: '榛勫皬鏄�'
+ },
+ {
+ materialCode:'SN23-0517001',
+ reportCode: 'SN23-0517001',
+ inspectionCode: 'SN23-0517001',
+ approver:'榛勫皬鏄�',
+ status: '',
+ conclusion: 1,
+ name: '榛勫皬鏄�'
+ }
+ ],
page: 1,
total: 0,
pageSize: 10,
checked: true,
+ dialogVisible: false,
};
},
created() {
- this.getData();
+ // this.getData();
+ },
+ mounted(){
+ },
+ components:{
+ Preview,
+ TestReport
},
methods: {
+ async queryReportByRCode(code){
+ const resp = await getReportData({code:code});
+ this.reportData = resp.data;
+ this.dialogVisible = true;
+ console.log(this.reportData);
+ },
+ //鏌ョ湅鎶ュ憡鎸夐挳
+ previewFun(row){
+ console.log(row)
+ this.reportType = row.type;
+ this.queryReportByRCode(row.reportCode);
+ },
+ //鎵撳嵃鎸夐挳
+ printFun(){
+ this.dialogVisible = false;
+ PrintJS({
+ printable: this.reportType===0 ? "printRaw" : "printFinished",
+ type: "html",
+ // header: "鍘熸潗鏂欐娴嬫姤鍛�",
+ targetStyles: ["*"],
+ ignoreElements: ["no-ignore"],
+ });
+ },
// 鐘舵�佹寜閽�
handleRadioChange() {
this.getData();
@@ -227,6 +293,7 @@
};
const { data } = await selectAllReport(params);
this.reportTable = data.row;
+ console.log(data.row);
this.total = data.total;
},
},
@@ -253,6 +320,8 @@
}
}
.library-table {
+ height: 80vh;
+ overflow: scroll;
background-color: #fff;
flex: 1;
margin: 0px -15px;
@@ -280,5 +349,14 @@
margin: 10px 0;
}
}
+ .printStyle{
+ overflow: scroll;
+ height:500px;
+ .el-button{
+ position: absolute;
+ top: 10vh;
+ left: 90%;
+ }
+ }
}
</style>
--
Gitblit v1.9.3