Merge remote-tracking branch 'origin/master'

src/views/modules/program/registered/ProjectList.vue

@@ -152,7 +152,6 @@
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === createName" type="text" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>
 
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
-              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
 
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.status1 === '5'&&(scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3'||scope.row.status2 === '4')" type="text" size="small" @click="secondAuditPush(scope.row)">二级校审</el-button>