Merge remote-tracking branch 'origin/master'

Crunchy

2023-11-18 7c4b02892b24bc2d219217b5f9e352d0eb531c4e

 src/views/quality/finishedProductInspection/index.vue

@@ -205,7 +205,7 @@
        watch:{
        printFormData(newVal){
            if(newVal){
                console.log("pData变化--",newVal);
                // console.log("pData变化--",newVal);
                this.printFormData = newVal
            }
        }
@@ -217,11 +217,19 @@
            },
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
                const printSettings = {
                        paper: {
                        width: 827, // A4纸的宽度（单位：像素）
                        height: 595, // A4纸的高度（单位：像素）
                        orientation: 'portrait', // 竖向打印
                        }}
                        
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    header:"",
                    maxWidth: 950,
                    printSettings,
                    style: '@page {margin: 2.0mm 2.0mm}',
                    targetStyles: ["*"],
                    // importCSS: true,
@@ -236,22 +244,20 @@
                    this.printFormData = res.data.data
                    this.printFormData.createTime = row.createTime
                    this.printFormData.updateTime = row.updateTime
                    console.log(this.printFormData,"7777777777=====");
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                let queryParam=this.$refs.finishedProduct.getQueryParam();
                delete queryParam.criteria
                console.log(queryParam);
                // console.log(queryParam);
                exportExaminationProducts(queryParam).then((res)=>{
                    transform(res)
                })
            },
         deleteHandle(row){
            console.log(row.id)
            // console.log(row.id)
            this.$confirm('确认删除该数据吗？', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',