|
@@ -161,10 +161,15 @@
|
|
let arr = this.dataSource.filter((res) => {
|
|
let arr = this.dataSource.filter((res) => {
|
|
return res.weituiClient == row.weituiClient;
|
|
return res.weituiClient == row.weituiClient;
|
|
});
|
|
});
|
|
- if(row.weituiClient !== this.dataSource[index - 1].weituiClient){
|
|
|
|
|
|
+
|
|
|
|
+ if(index == 0){
|
|
obj.attrs.rowSpan = arr.length
|
|
obj.attrs.rowSpan = arr.length
|
|
- } else {
|
|
|
|
- obj.attrs.rowSpan = 0
|
|
|
|
|
|
+ }else {
|
|
|
|
+ if(row.weituiClient !== this.dataSource[index - 1].weituiClient){
|
|
|
|
+ obj.attrs.rowSpan = arr.length
|
|
|
|
+ } else {
|
|
|
|
+ obj.attrs.rowSpan = 0
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return obj
|
|
return obj
|
|
},
|
|
},
|
|
@@ -183,10 +188,15 @@
|
|
let arr = this.dataSource.filter((res) => {
|
|
let arr = this.dataSource.filter((res) => {
|
|
return res.weituiAddress == row.weituiAddress;
|
|
return res.weituiAddress == row.weituiAddress;
|
|
});
|
|
});
|
|
- if(row.weituiAddress !== this.dataSource[index - 1].weituiAddress){
|
|
|
|
|
|
+
|
|
|
|
+ if(index == 0){
|
|
obj.attrs.rowSpan = arr.length
|
|
obj.attrs.rowSpan = arr.length
|
|
- } else {
|
|
|
|
- obj.attrs.rowSpan = 0
|
|
|
|
|
|
+ }else {
|
|
|
|
+ if(row.weituiAddress !== this.dataSource[index - 1].weituiAddress){
|
|
|
|
+ obj.attrs.rowSpan = arr.length
|
|
|
|
+ } else {
|
|
|
|
+ obj.attrs.rowSpan = 0
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return obj
|
|
return obj
|
|
},
|
|
},
|