diff --git a/client/src/views/ability/qualification.vue b/client/src/views/ability/qualification.vue index 33ff232..2abb905 100644 --- a/client/src/views/ability/qualification.vue +++ b/client/src/views/ability/qualification.vue @@ -214,6 +214,7 @@ delarr:[], this.getList() this.getGroup() }, + methods: { checkPermission, handleUploadSuccess(res, file) { @@ -235,32 +236,32 @@ delarr:[], this.tableData = response.data - let OrderObj = {} + let OrderObj = {} this.tableData.forEach((element, index) => { element.rowIndex = index if (OrderObj[element.qualification_.id]) { OrderObj[element.qualification_.id].push(index) - } else { + } + else { OrderObj[element.qualification_.id] = [] OrderObj[element.qualification_.id].push(index) } }) - this.$nextTick(()=>{ - this.$refs.filterTable.doLayout() -}) - // 将数组长度大于1的值 存储到this.OrderIndexArr(也就是需要合并的项) + var indexarrs=[] + // 将数组长度大于1的值 存储到this.OrderIndexArr(也就是需要合并的项) for (let k in OrderObj) { if (OrderObj[k].length > 1) { - this.OrderIndexArr.push(OrderObj[k]) + indexarrs.push(OrderObj[k]) } } } + this.OrderIndexArr=indexarrs this.listLoading = false }) - + console.log(this.OrderIndexArr) }, // 合并单元格 objectSpanMethod({row,column,rowIndex,columnIndex}) { @@ -342,6 +343,7 @@ delarr:[], }, handleFilter2() { this.getList() + this.getGroup() }, handleAdd() { this.formData = Object.assign({}, defaultCMA) @@ -421,6 +423,9 @@ val = val + ""; return val; } }, + + + } };