Merge remote-tracking branch 'origin/master'

王震

2023-11-16 1f9c32908a68eef81f549b6986a9bc1f05056108

 src/views/quality/rawMaterial/index.vue

@@ -262,7 +262,6 @@
        //查看报告按钮
        previewFun(row){
            getObj(row.id).then(res=>{
                console.log(res);
                this.printFormData = res.data.data
                this.printDialogVisible = true
            }).catch(error=>{
@@ -275,9 +274,9 @@
            PrintJS({
                printable: "printRaw",
                type: "html",
                maxWidth: 900,
                maxWidth: 880,
                // header: "原材料检测报告",
                style: '@page {margin: 0 5mm}',
                style: '@page {margin: 0 5mm;}',
                targetStyles: ["*"],
                ignoreElements: ["no-ignore"],
                orientation: 'portrait'