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

王震

2023-12-19 2fa578a18ed9055f8cb9863a8a0f02977cfa8350

 src/views/quality/processInspect/index.vue

@@ -73,6 +73,14 @@
                        },
                        {
                            minWidth: '120',
                            prop: 'materialCode',
                            label: '产品编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'material',
                            label: '产品名称',
                            isTrue: true,
@@ -160,10 +168,10 @@
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    {
                        text: '导出',
                        fun: this.exportExcel
                    }
                    // {
                    //     text: '导出',
                    //     fun: this.exportExcel
                    // }
                    ],
                    operator: [{
                        text: '作废',
@@ -209,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){