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

Fixiaobai

2023-12-15 ad2437550eb0c8f3c3c8736df1a38a713f920ec2

 src/views/quality/processInspect/index.vue

@@ -56,12 +56,28 @@
                    column: [
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单编号',
                            prop: 'proInsNo',
                            label: '过程检验编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                            render: { fun: this.addOrUpdateHandle }
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'materialCode',
                            label: '产品编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -152,10 +168,10 @@
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    {
                        text: '导出',
                        fun: this.exportExcel
                    }
                    // {
                    //     text: '导出',
                    //     fun: this.exportExcel
                    // }
                    ],
                    operator: [{
                        text: '作废',
@@ -177,7 +193,6 @@
            exportExcel(){
                let queryParam=this.$refs.processInspect.getQueryParam();
                delete queryParam.criteria
                console.log(queryParam);
                exportProcessInsProduct(queryParam).then((res)=>{
                    transform(res)
                })
@@ -202,8 +217,9 @@
         addOrUpdateHandle(row) {
            this.$router.push({
               name: 'processInspectForm',
               query: { id: row == null ? null : row.id,resultVal : row == null ? null : row.result },
            })
               query: { id: row == null ? null : row.id },
                    params: { resultVal : row == null ? null : row.result }
                })
         },
            formatResult(row, column, cellValue){
                if(cellValue != undefined || cellValue != null){