Merge remote-tracking branch 'origin/master'

zss

2024-02-29 b172994cb67bd03949e40dd810fffd0293054929

 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