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

yaowanxin

3 天以前 62edc8fceb830c85f2a81a525fb9dbbefaac7153

 src/views/safeProduction/safetyTrainingAssessment/index.vue

@@ -626,7 +626,7 @@
        {
          name: "结果明细",
          type: "text",
          // disabled: row => row.state !== 2,
          disabled: row => row.state == 0,
          clickFun: row => {
            viewResultDetail(row);
          },