Merge remote-tracking branch 'origin/master'

王震

2023-11-09 33ce4f1be4c7fe39a3b6745d4d1db90e4fcdde77

 src/views/quality/finishedProductInspection/index.vue

@@ -16,7 +16,7 @@
            top="10vh"
            title="打印预览"
            :visible.sync="printDialogVisible"
            width="70%">
            width="65%">
            <div style="width:100%;height: 60vh;overflow-y: scroll;">
                <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
            </div>
@@ -33,7 +33,7 @@
    import ttable from '@/views/common/ztt-table.vue'
    import * as fecha from 'element-ui/lib/utils/date'
   import finishedProductInspectionAdd from './finishedProduct-form'
    import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
    import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProduct-print.vue'
    import PrintJS from 'print-js'
@@ -196,8 +196,8 @@
      },
      created() { },
      methods: {
                    //打印按钮
        printFun() {
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
                PrintJS({
                    printable: "printRaw",
@@ -209,8 +209,13 @@
                    orientation: 'portrait'
                });
            },
            showPrint(){
                this.printDialogVisible = true
            showPrint(row){
                queryById(row.id).then(res=>{
                    console.log(res);
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                console.log("============");