修改错位
This commit is contained in:
parent
243f6996c1
commit
fc942497ce
|
@ -214,6 +214,7 @@ delarr:[],
|
||||||
this.getList()
|
this.getList()
|
||||||
this.getGroup()
|
this.getGroup()
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
checkPermission,
|
checkPermission,
|
||||||
handleUploadSuccess(res, file) {
|
handleUploadSuccess(res, file) {
|
||||||
|
@ -235,32 +236,32 @@ delarr:[],
|
||||||
|
|
||||||
|
|
||||||
this.tableData = response.data
|
this.tableData = response.data
|
||||||
let OrderObj = {}
|
let OrderObj = {}
|
||||||
|
|
||||||
this.tableData.forEach((element, index) => {
|
this.tableData.forEach((element, index) => {
|
||||||
element.rowIndex = index
|
element.rowIndex = index
|
||||||
if (OrderObj[element.qualification_.id]) {
|
if (OrderObj[element.qualification_.id]) {
|
||||||
OrderObj[element.qualification_.id].push(index)
|
OrderObj[element.qualification_.id].push(index)
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
OrderObj[element.qualification_.id] = []
|
OrderObj[element.qualification_.id] = []
|
||||||
OrderObj[element.qualification_.id].push(index)
|
OrderObj[element.qualification_.id].push(index)
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
this.$nextTick(()=>{
|
var indexarrs=[]
|
||||||
this.$refs.filterTable.doLayout()
|
// 将数组长度大于1的值 存储到this.OrderIndexArr(也就是需要合并的项)
|
||||||
})
|
|
||||||
// 将数组长度大于1的值 存储到this.OrderIndexArr(也就是需要合并的项)
|
|
||||||
for (let k in OrderObj) {
|
for (let k in OrderObj) {
|
||||||
if (OrderObj[k].length > 1) {
|
if (OrderObj[k].length > 1) {
|
||||||
this.OrderIndexArr.push(OrderObj[k])
|
indexarrs.push(OrderObj[k])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.OrderIndexArr=indexarrs
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
|
|
||||||
})
|
})
|
||||||
|
console.log(this.OrderIndexArr)
|
||||||
},
|
},
|
||||||
// 合并单元格
|
// 合并单元格
|
||||||
objectSpanMethod({row,column,rowIndex,columnIndex}) {
|
objectSpanMethod({row,column,rowIndex,columnIndex}) {
|
||||||
|
@ -342,6 +343,7 @@ delarr:[],
|
||||||
},
|
},
|
||||||
handleFilter2() {
|
handleFilter2() {
|
||||||
this.getList()
|
this.getList()
|
||||||
|
this.getGroup()
|
||||||
},
|
},
|
||||||
handleAdd() {
|
handleAdd() {
|
||||||
this.formData = Object.assign({}, defaultCMA)
|
this.formData = Object.assign({}, defaultCMA)
|
||||||
|
@ -421,6 +423,9 @@ val = val + "";
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
Loading…
Reference in New Issue