解决代码冲突
This commit is contained in:
@@ -75,19 +75,19 @@
|
||||
@click="showModel(scope.row, 0)">查看裁决书</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit"
|
||||
v-if="scope.row.caseStatus == 11 && checkPermi(['awardManagement:list:secretarycheck'])"
|
||||
@click="showModel(scope.row, 1)">秘书确认</el-button>
|
||||
@click="showModel(scope.row, 1)">确认裁决书</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit"
|
||||
v-if="scope.row.caseStatus == 18 && checkPermi(['awardManagement:list:check']) && btnStatus"
|
||||
@click="showModel(scope.row, 4)">仲裁员确认</el-button>
|
||||
@click="showModel(scope.row, 4)">核查裁决书</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit"
|
||||
v-if="scope.row.caseStatus == 12 && checkPermi(['awardManagement:list:confirmaward']) && btnStatus"
|
||||
@click="showModel(scope.row, 2)">部门长确认</el-button>
|
||||
@click="showModel(scope.row, 2)">审核裁决书</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit"
|
||||
v-if="scope.row.caseStatus == 13 && checkPermi(['awardManagement:list:sign']) && btnStatus"
|
||||
@click="showModel(scope.row, 3)">签名</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit"
|
||||
v-if="scope.row.caseStatus == 14 && checkPermi(['awardManagement:list:signprint']) && btnStatus"
|
||||
@click="showaffixModel(scope.row, 4)">用印申请</el-button>
|
||||
@click="showaffixModel(scope.row, 4)">用印</el-button>
|
||||
<!-- v-if="scope.row.caseStatus > 15" -->
|
||||
<el-button size="mini" type="text" icon="el-icon-truck"
|
||||
v-if="scope.row.caseStatus > 15 && checkPermi(['delivery:list:detail'])"
|
||||
|
||||
Reference in New Issue
Block a user