@ -1,6 +1,6 @@
import router from './router'
import { isRelogin } from '@/config/axios/service'
import { getAccessToken } from '@/utils/auth'
import { getAccessToken, removeToken } from '@/utils/auth'
import { useTitle } from '@/hooks/web/useTitle'
import { useNProgress } from '@/hooks/web/useNProgress'
import { usePageLoading } from '@/hooks/web/usePageLoading'
@ -405,8 +405,8 @@ function importHistorySalary() {
function spanMethod({ row, columnIndex }) {
if (row.userSalaryGrantRespVOList && row.userSalaryGrantRespVOList.length > 0) {
if (columnIndex === 0) {
return [1, 22]
} else if (columnIndex == 22 && row.id) {
return [1, 23]
} else if (columnIndex == 23 && row.id) {
return [1, 1]
} else {
return [0, 0]