Merge remote-tracking branch 'origin/master'

zss

2023-11-10 ebb0c6d8aca09a9bf8b7890d895448e86d90c4f9

 src/views/quality/finishedProductInspection/index.vue

@@ -236,15 +236,13 @@
            },
            showPrint(row){
                queryById(row.id).then(res=>{
                    console.log(res);
                this.printFormData = res.data.data
                    this.printFormData = res.data.data
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                console.log("============");
                let queryParam=this.$refs.finishedProduct.getQueryParam();
                delete queryParam.criteria
                console.log(queryParam);