qiushanhe/ss-oa-manage-web
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

sc

Browse Source
This commit is contained in:
qsh
2025-01-14 17:40:36 +08:00
parent 853a18df9b
commit b1feb33c00
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/permission.js
View File

@@ -1,6 +1,6 @@
import router from './router' import router from './router'
import { isRelogin } from '@/config/axios/service' import { isRelogin } from '@/config/axios/service'
import { getAccessToken } from '@/utils/auth' import { getAccessToken, removeToken } from '@/utils/auth'
import { useTitle } from '@/hooks/web/useTitle' import { useTitle } from '@/hooks/web/useTitle'
import { useNProgress } from '@/hooks/web/useNProgress' import { useNProgress } from '@/hooks/web/useNProgress'
import { usePageLoading } from '@/hooks/web/usePageLoading' import { usePageLoading } from '@/hooks/web/usePageLoading'

4
src/views/Home/Salary/index.vue
View File

@@ -405,8 +405,8 @@ function importHistorySalary() {
function spanMethod({ row, columnIndex }) { function spanMethod({ row, columnIndex }) {
if (row.userSalaryGrantRespVOList && row.userSalaryGrantRespVOList.length > 0) { if (row.userSalaryGrantRespVOList && row.userSalaryGrantRespVOList.length > 0) {
if (columnIndex === 0) { if (columnIndex === 0) {
return [1, 22] return [1, 23]
} else if (columnIndex == 22 && row.id) { } else if (columnIndex == 23 && row.id) {
return [1, 1] return [1, 1]
} else { } else {
return [0, 0] return [0, 0]