Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/quality/finishedProductInspection/index.vue

@@ -37,6 +37,7 @@
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProducter-print.vue'
    import PrintJS from 'print-js'
    import { title } from 'process'
   export default {
      components: {
         finishedProductInspectionAdd,
@@ -72,14 +73,30 @@
                    data: [],
                    // 标题
                    column: [
                         {
                            minWidth: '120',
                            prop: 'finInsNo',
                            label: '产品检验编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                            render: { fun: this.addOrUpdateHandle }
                        },
                        {
                            minWidth: '120',
                            prop: 'productNo',
                            label: '报工单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                            render: { fun: this.addOrUpdateHandle }
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -98,6 +115,14 @@
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                        },
                        {
                            minWidth: '120',
                            prop: 'outBatchNo',
                            label: '批次号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -163,11 +188,11 @@
                        },
                    ],
                    toolbar: [
                    {
                    /* {
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    }, */
                    {
                        text: '导出',
                        type: 'primary',
@@ -205,34 +230,23 @@
        watch:{
        printFormData(newVal){
            if(newVal){
                // console.log("pData变化--",newVal);
                this.printFormData = newVal
            }
        }
    },
      methods: {
            closedown(){
                // this.printFormData = []
                this.printDialogVisible = false;
            },
            //打印按钮
            printFun() {
                const printSettings = {
                        paper: {
                        width: 827, // A4纸的宽度（单位：像素）
                        height: 595, // A4纸的高度（单位：像素）
                        orientation: 'portrait', // 竖向打印
                        }}
                        
                const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 黑体;!important;}' ;
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    header:"",
                    maxWidth: 1000,
                    printSettings,
                    style: '@page {margin: 2.0mm 2.0mm;size:A4;}',
                    scanStyles: false,
                    maxWidth: 1200,
                    header: "产品检测报告",
                    style:style,
                    css:'./title.css',
                    targetStyles: ["*"],
                    fontSize: '30px',
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'
                });
@@ -250,13 +264,11 @@
            exportExcel(){
                let queryParam=this.$refs.finishedProduct.getQueryParam();
                delete queryParam.criteria
                // console.log(queryParam);
                exportExaminationProducts(queryParam).then((res)=>{
                    transform(res)
                })
            },
         deleteHandle(row){
            // console.log(row.id)
            this.$confirm('确认删除该数据吗？', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
@@ -278,6 +290,8 @@
               name: 'finishedProductForm',
               query: { 
                        id: row == null ? null : row.id,
                    },
                    params: {
                        resultVal: row == null ? null : row.result 
                    }
            })