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

Fixiaobai

2023-12-14 57214d3ef6e7a32685b791ff3c8f1fc49539e055

 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,
@@ -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){