Browse Source

Merge remote-tracking branch 'origin/master'

lizhenhao 2 years atrás
parent
commit
54606b674f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/views/modules/program/registered/ProjectList.vue

+ 2 - 2
src/views/modules/program/registered/ProjectList.vue

@@ -143,11 +143,11 @@
             <template  slot-scope="scope">
               <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3'||scope.row.status === '4')&&scope.row.createBy === createName" type="text" size="small" @click="registeredPush(scope.row)">修改</el-button>
               <!--管理员角色登记完成后可修改-->
-              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && isAdmin && commonJS.isEmpty(scope.row.status1)" type="text" size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && isAdmin" type="text" size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '2'&&scope.row.createBy === createName" type="text" size="small" @click="registeredReback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('program:registered:del')&&scope.row.status !== '2' && scope.row.status !== '5'&&scope.row.createBy === createName" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
               <!--管理员角色登记完成后可删除-->
-              <el-button v-if="hasPermission('program:registered:del')&&scope.row.status === '5' && isAdmin && commonJS.isEmpty(scope.row.status1)" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('program:registered:del')&&scope.row.status === '5' && isAdmin" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
 
               <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>