|
@@ -498,7 +498,8 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
spanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
- if (columnIndex === 1) {
|
|
|
+ let t = [3, 5, 2][this.type - 1];
|
|
|
+ if (columnIndex > 0 && columnIndex <= t) {
|
|
|
const num = this.spanData[rowIndex];
|
|
|
if (num) {
|
|
|
return {
|
|
@@ -567,6 +568,7 @@ export default {
|
|
|
return data;
|
|
|
},
|
|
|
changeSearch() {
|
|
|
+ return;
|
|
|
this.search(2);
|
|
|
},
|
|
|
getDataList(data) {
|