|
|
@@ -433,7 +433,7 @@
|
|
|
<div>
|
|
|
<template v-if="!getClaimDel(scope.row) || !getFeatureDel(scope.row)">
|
|
|
<el-button @click="manageInvalidEvidence(scope.row)" type="text" size="small">管理{{ifSecondInvalid?'第二次':''}}无效证据</el-button>
|
|
|
- <el-button v-if="scope.row.proofGroupDescription" @click="remove(scope.row)" type="text" size="small">删除组合</el-button>
|
|
|
+ <el-button v-if="scope.row.proofGroupDescription || scope.row.proofGroupDescription2" @click="remove(scope.row)" type="text" size="small">删除组合</el-button>
|
|
|
</template>
|
|
|
<el-button @click="details(scope)" type="text" size="small" v-if="showDetails(scope)">详情</el-button>
|
|
|
<el-button @click="details(scope)" type="text" size="small" v-else>关闭详情</el-button>
|
|
|
@@ -1104,6 +1104,7 @@ export default {
|
|
|
|
|
|
//获取每个元素所需合并的行数
|
|
|
getSpanArr(data) {
|
|
|
+ console.log(data)
|
|
|
this.mergeArr.forEach((key, index1) => {
|
|
|
let count = 0;
|
|
|
this.mergeObj[key] = [];
|
|
|
@@ -1127,7 +1128,7 @@ export default {
|
|
|
if (index === 0) {
|
|
|
this.mergeObj[key].push(1);
|
|
|
} else {
|
|
|
- if (item[key] === data[index - 1][key] && item.claimSort === data[index - 1].claimSort && item.statutesId === data[index - 1].statutesId) {
|
|
|
+ if (item.proofGroupId === data[index - 1].proofGroupId && item.claimSort === data[index - 1].claimSort && item.statutesId === data[index - 1].statutesId) {
|
|
|
this.mergeObj[key][count] += 1;
|
|
|
this.mergeObj[key].push(0);
|
|
|
} else {
|
