Merge branch 'master' into test

src/views/inspectionWork/index.vue

@@ -114,7 +114,7 @@
             v-if="
                 row.status == 1 &&
                 isReportApproval == 1 &&
-                !row.reportApprovalStatus && row.reportApprovalStatus != 0 && 
+                (!row.reportApprovalStatus || row.reportApprovalStatus == 0) && 
                 $hasPermission('qms:quality_work_order:generateReport')
               "
           >