Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-17 2fefc3c07619a513fe82144ea1f8d75c068bcb9e

 src/views/quality/finishedProductInspection/index.vue

@@ -21,7 +21,7 @@
                <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="()=>{printDialogVisible = false;this.printFormData=null}">取 消</el-button>
                <el-button @click="()=>{printDialogVisible = false;printFormData=null}">取 消</el-button>
                <el-button type="primary" @click="printFun()">打 印</el-button>
            </span>
            </el-dialog>
@@ -205,45 +205,53 @@
        watch:{
        printFormData(newVal){
            if(newVal){
                // console.log("pData变化--",newVal);
                this.printFormData = newVal
            }
        }
    },
      methods: {
            
            closedown(){
                // this.printFormData = []
                this.printDialogVisible = false;
            },
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    maxWidth: 700,
                    style: '@page {margin: 0 5mm}',
                    maxWidth: 950,
                    style: '@page {margin: 2.0mm 2.0mm}',
                    targetStyles: ["*"],
                    // importCSS: true,
                    fontSize: '30px',
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'
                });
            },
            //查看报告按钮
            showPrint(row){
                console.log('----------');
                queryById(row.id).then(res=>{
                    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);
                    // 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: '取消',