Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

gaoluyang

5 天以前 eb60380ea4981bd7e033a6a57ed524afb2f6c09b

 src/views/qualityManagement/nonconformingManagement/index.vue

@@ -98,7 +98,7 @@
      } else if (params == '合格') {
        return "success";
      } else {
        return null;
        return 'danger';
      }
    },
  },