|
@@ -484,8 +484,6 @@ export default {
|
|
},
|
|
},
|
|
//合并单元格
|
|
//合并单元格
|
|
mergeMethod({row, column, rowIndex, columnIndex}) {
|
|
mergeMethod({row, column, rowIndex, columnIndex}) {
|
|
- // this.msgSuccess("已发起确认流程");
|
|
|
|
- this.getList();
|
|
|
|
if ([1, 2, 4].includes(columnIndex)) {
|
|
if ([1, 2, 4].includes(columnIndex)) {
|
|
const _row = this.setTable(this.regionList).merge[rowIndex];
|
|
const _row = this.setTable(this.regionList).merge[rowIndex];
|
|
const _col = _row > 0 ? 1 : 0;
|
|
const _col = _row > 0 ? 1 : 0;
|
|
@@ -497,8 +495,6 @@ export default {
|
|
},
|
|
},
|
|
//单元格整理
|
|
//单元格整理
|
|
setTable(tableData) {
|
|
setTable(tableData) {
|
|
- // this.msgSuccess("已发起确认流程");
|
|
|
|
- this.getList();
|
|
|
|
let spanArr = [],
|
|
let spanArr = [],
|
|
concat = 0;
|
|
concat = 0;
|
|
tableData.forEach((item, index) => {
|
|
tableData.forEach((item, index) => {
|