Merge remote-tracking branch 'origin/master'

value

2023-08-30 e29601d320865c7cf3b6d0d35640659f6f51a0a6

 src/views/experiment/checkTheReport/index.vue

@@ -60,7 +60,8 @@
          <el-button type="primary" @click="printFun()">打印</el-button>
        </span>
        <div class="printStyle">
          <preview id="printDiv" :reportData="reportData"></preview>
          <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">
@@ -181,18 +182,39 @@
<script>
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,
@@ -201,29 +223,32 @@
    };
  },
  created() {
    this.getData();
    // this.getData();
  },
  mounted(){
  },
  components:{
    Preview
    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){
      this.dialogVisible = true;
      console.log(row)
      this.reportType = row.type;
      this.queryReportByRCode(row.reportCode);
    },
    //打印按钮
    printFun(){
      this.dialogVisible = false;
      PrintJS({
        printable: "printDiv",
        printable: this.reportType===0 ? "printRaw" : "printFinished",
        type: "html",
        // header: "原材料检测报告",
        targetStyles: ["*"],
@@ -295,6 +320,8 @@
  }
}
.library-table {
  height: 80vh;
  overflow: scroll;
  background-color: #fff;
  flex: 1;
  margin: 0px -15px;
@@ -324,7 +351,7 @@
  }
  .printStyle{
    overflow: scroll;
    height:600px;
    height:500px;
    .el-button{
      position: absolute;
      top: 10vh;