合并冲突

licp

2024-04-29 ea1a8cf41c11f8f533cea594e1f1c03640cf4a96

 src/views/quality/processconfiguration/index.vue

@@ -322,7 +322,8 @@
            text: '审核结果',
            type: 'text',
            size: 'small',
            fun: this.AuditResult
            fun: this.AuditResult,
            showFun: (row)=>{return row.type != '原材料检验'}
          })
    }
    this.table.operator = arr.length>0 ? arr : null