|
|
@@ -202,9 +202,7 @@ import {
|
|
|
delPssrModel,
|
|
|
exportPssrModel,
|
|
|
getPssrModel,
|
|
|
- listPssrModel,
|
|
|
- updatePssrModel,
|
|
|
- updatePssrModelBatch,
|
|
|
+ listPssrModel
|
|
|
} from "@/api/pssr/pssrModel";
|
|
|
import {treeselect} from "@/api/system/dept";
|
|
|
import {getToken} from "@/utils/auth";
|
|
|
@@ -464,7 +462,7 @@ export default {
|
|
|
//合并单元格
|
|
|
mergeMethod({row, column, rowIndex, columnIndex}) {
|
|
|
if ([1].includes(columnIndex)) {
|
|
|
- const _row = this.setTable(this.subcontentList).merge[rowIndex];
|
|
|
+ const _row = this.setTable(this.pssrModelList).merge[rowIndex];
|
|
|
const _col = _row > 0 ? 1 : 0;
|
|
|
return {
|
|
|
rowspan: _row,
|
