|
@@ -25,6 +25,12 @@
|
|
|
<span v-for="item in scope.row.verifyList" :class="item.verifyStatus?'verify-green':'verify-red'">{{item.name}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="授权状态" align="left" prop="isretry">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="!scope.row.isretry">成功</span>
|
|
|
+ <span v-if="scope.row.isretry">失败</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="类别" align="left" prop="userType"></el-table-column>
|
|
|
<el-table-column label="授权时间" align="left" prop="verifyTime"></el-table-column>
|
|
|
<el-table-column label="授权人" align="left" prop="verifyUser"></el-table-column>
|
|
@@ -525,6 +531,7 @@ export default {
|
|
|
let verifyList=[];
|
|
|
let isVerify=true;
|
|
|
let isretry=true;//判断是否需要显示重试按钮
|
|
|
+ let isOr=true;//判断是或还是+
|
|
|
_this.tableData.forEach(function(item) {
|
|
|
if(item.verifyMode.indexOf('或')!=-1){//或
|
|
|
|
|
@@ -554,9 +561,11 @@ export default {
|
|
|
}
|
|
|
item.verifyList=verifyList;
|
|
|
item.isretry=isretry;
|
|
|
+ item.isOr=true;
|
|
|
verifyList=[];
|
|
|
|
|
|
}else{//+
|
|
|
+ debugger
|
|
|
if(item.verifyMode.search('密码')!=-1 && !item.state){
|
|
|
isVerify=false;
|
|
|
isretry=false;
|
|
@@ -576,6 +585,7 @@ export default {
|
|
|
verifyList.push({verifyStatus:isVerify,name:item.verifyMode})
|
|
|
item.verifyList=verifyList;
|
|
|
item.isretry=isretry;
|
|
|
+ item.isOr=false;
|
|
|
verifyList=[];
|
|
|
}
|
|
|
})
|