Merge remote-tracking branch 'origin/master'

zss

2023-12-14 1789ce3650a2665b5abca7a3028611190d1983df

 src/views/quality/finishedProductInspection/index.vue

@@ -37,7 +37,7 @@
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProducter-print.vue'
    import PrintJS from 'print-js'
import { title } from 'process'
    import { title } from 'process'
   export default {
      components: {
         finishedProductInspectionAdd,
@@ -84,8 +84,16 @@
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            prop: 'productNo',
                            label: '报工单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
@@ -180,30 +188,13 @@
                        },
                    ],
                    toolbar: [
                    /* {
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    }, */
                    {
                        text: '导出',
                        type: 'primary',
                        fun: this.exportExcel
                    }
                        {
                            text: '下载检验报告',
                            type: 'primary',
                            fun: this.downloadProReport
                        }
                    ],
                    operator: [{
                        text: '打印',
                        type: 'text',
                        size: 'small',
                        fun: this.showPrint,
                        show: {
                            val: [
                                '1',
                                '0'
                            ],
                            key: 'result'
                        }
                    },{
                        text: '作废',
                        type: 'text',
                        size: 'small',
@@ -222,12 +213,14 @@
        watch:{
        printFormData(newVal){
            if(newVal){
                // console.log("pData变化--",newVal);
                this.printFormData = newVal
            }
        }
    },
      methods: {
            downloadProReport(){
                this.$message.info("开发中...")
            },
            //打印按钮
            printFun() {
                const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 黑体;!important;}' ;
@@ -257,13 +250,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: '取消',
@@ -285,6 +276,8 @@
               name: 'finishedProductForm',
               query: { 
                        id: row == null ? null : row.id,
                    },
                    params: {
                        resultVal: row == null ? null : row.result 
                    }
            })